From 7e11bb87c697f4fdc62e57353b7ace3e80ee9cf0 Mon Sep 17 00:00:00 2001
From: Terje Rosten <terje.rosten@ntnu.no>
Date: May 03 2020 20:33:53 +0000
Subject: 1.22


---

diff --git a/.gitignore b/.gitignore
index 4fa9ed3..cc331ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xosview-1.8.3-20080301.tar.gz
 /xosview-1.19.tar.gz
 /xosview-1.20.tar.gz
 /xosview-1.21.tar.gz
+/xosview-1.22.tar.gz
diff --git a/sources b/sources
index b617030..c96272f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xosview-1.21.tar.gz) = 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b
+SHA512 (xosview-1.22.tar.gz) = 9bf37f557d9c07a300f6f9c21e197d25d4c5a4bb6e67b40af9c44a3159ea5010d7ba5bf427a9cec9729fa423da132a1364d0ac7027e9bc9bcd33f490d9e8282a
diff --git a/xosview-1.20-arm.patch b/xosview-1.20-arm.patch
deleted file mode 100644
index 4ed0ace..0000000
--- a/xosview-1.20-arm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/linux/serialmeter.cc b/linux/serialmeter.cc
-index e3a5c0f..918e020 100644
---- a/linux/serialmeter.cc
-+++ b/linux/serialmeter.cc
-@@ -30,7 +30,7 @@ typedef unsigned long long u64;
- #endif
- 
- #if defined(GNULIBC) || defined(__GLIBC__)
--#if !defined(__powerpc__) && !defined(__hppa__) && !defined(__mips__) && !defined(__sparc__) && !defined(__sh__) && !defined(__s390__) && !defined(__s390x__) && !defined(__m68k__) && !defined(__aarch64__)
-+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__hppa__) && !defined(__mips__) && !defined(__sparc__) && !defined(__sh__) && !defined(__s390__) && !defined(__s390x__) && !defined(__m68k__) && !defined(__aarch64__)
- #include <sys/io.h>
- #endif
- #if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__mips__) && !defined(__sh__) && !defined(__s390__) && !defined (__s390x__) && !defined(__m68k__) && !defined(__aarch64__)
diff --git a/xosview.spec b/xosview.spec
index 326bff0..9ac13a1 100644
--- a/xosview.spec
+++ b/xosview.spec
@@ -1,7 +1,7 @@
 Summary:       An X Window System utility for monitoring system resources
 Name:          xosview
-Version:       1.21
-Release:       2%{?dist}
+Version:       1.22
+Release:       1%{?dist}
 # The netbsd/swapinternal.{cc,h} source files are BSD only (with 
 # advertising), but neither file is used in the linux version of 
 # xosview.  Instead, the source files used are linux/swapmeter.{cc,h}, 
@@ -11,7 +11,6 @@ License:       GPL+
 URL:           http://www.pogo.org.uk/~mark/xosview/
 Source0:       http://www.pogo.org.uk/~mark/xosview/releases/xosview-%{version}.tar.gz
 Patch0:        xosview-1.11-app-def.patch
-Patch1:        xosview-1.20-arm.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gcc-c++
 BuildRequires: libXpm-devel
@@ -23,9 +22,7 @@ current system state, including memory usage, CPU usage, system load,
 etc. Xosview runs under the X Window System.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup
 
 %build
 make %{?_smp_mflags} OPTFLAGS="%{optflags}"
@@ -45,6 +42,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{_datadir}/X11/app-defaults/XOsview
 
 %changelog
+* Sun May 03 2020 Terje Rosten <terje.rosten@ntnu.no> - 1.22-1
+- 1.22
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild