diff --git a/.gitignore b/.gitignore index 387f344..b1658df 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,3 @@ xosview-1.8.3-20080301.tar.gz /xosview-1.21.tar.gz /xosview-1.22.tar.gz /xosview-1.23.tar.gz -/xosview-1.24.tar.gz -/xosview-1.25.tar.gz diff --git a/sources b/sources index 7067259..510715f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xosview-1.25.tar.gz) = 723f8710d5beb72999b2d42685bf0eb440a30ef972d6f5742e74a4519dfcf9ae7a612231d4bd194ce40ec37a79b7b559ccf6ae08c5e5e8bb824f0a496636b28c +SHA512 (xosview-1.23.tar.gz) = 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1 diff --git a/xosview-1.24-app-def.patch b/xosview-1.11-app-def.patch similarity index 84% rename from xosview-1.24-app-def.patch rename to xosview-1.11-app-def.patch index e90fbab..daa16f0 100644 --- a/xosview-1.24-app-def.patch +++ b/xosview-1.11-app-def.patch @@ -1,8 +1,8 @@ diff --git a/Xrm.cc b/Xrm.cc -index 9795add..5b2973d 100644 +index 4fa1848..91f7550 100644 --- a/Xrm.cc +++ b/Xrm.cc -@@ -144,7 +144,7 @@ Listed from weakest to strongest: +@@ -143,7 +143,7 @@ Listed from weakest to strongest: XrmQuarkToString(_class)); if (result >= 0 && result < rlen) XrmCombineFileDatabase (rfilename, &_db, 1); diff --git a/xosview.spec b/xosview.spec index db22afb..64065a3 100644 --- a/xosview.spec +++ b/xosview.spec @@ -1,16 +1,16 @@ Summary: An X Window System utility for monitoring system resources Name: xosview -Version: 1.25 -Release: 3%{?dist} +Version: 1.23 +Release: 2%{?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}, # both of which fall under the GPL. All other files are either GPL # based, or can fall under either the BSD or GPL copyright. -License: GPL-1.0-or-later +License: GPL+ URL: http://www.pogo.org.uk/~mark/xosview/ Source0: http://www.pogo.org.uk/~mark/xosview/releases/xosview-%{version}.tar.gz -Patch: xosview-1.24-app-def.patch +Patch0: xosview-1.11-app-def.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libX11-devel @@ -23,70 +23,26 @@ current system state, including memory usage, CPU usage, system load, etc. Xosview runs under the X Window System. %prep -%autosetup -p1 +%autosetup %build -%make_build OPTFLAGS="%{optflags}" +make %{?_smp_mflags} OPTFLAGS="%{optflags}" %install -%make_install PREFIX=%{_prefix} +make install PREFIX=%{buildroot}%{_prefix} INSTALL="install -p" install -p -m 0644 -D Xdefaults %{buildroot}%{_datadir}/X11/app-defaults/XOsview - -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/xosview.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files %license COPYING COPYING.GPL %doc CHANGES README README.linux TODO Xdefaults -%{_bindir}/xosview -%{_mandir}/man1/xosview.1* +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* %{_datadir}/icons/hicolor/32x32/apps/xosview.png -%{_datadir}/applications/xosview.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/X11/app-defaults/XOsview %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.25-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jan 14 2026 Terje Røsten - 1.25-1 -- 1.25 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.24-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.24-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.24-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 17 2024 Miroslav Suchý - 1.24-4 -- convert license to SPDX - -* Sat Jan 27 2024 Fedora Release Engineering - 1.24-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Feb 02 2023 Terje Rosten - 1.24-1 -- 1.24 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.23-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.23-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Thu Jan 28 2021 Fedora Release Engineering - 1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild