- updated to 1.24

diff --git a/xosview-c++.patch b/xosview-c++.patch
deleted file mode 100644 (file)
index f41e3c1..0000000
--- a/xosview-c++.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- xosview-1.8.4/xwin.cc.orig 2015-06-04 16:49:00.000000000 +0200
-+++ xosview-1.8.4/xwin.cc      2024-02-04 12:46:57.721543774 +0100
-@@ -418,8 +418,6 @@ const char *XWin::getResource( const cha
-   {
-     std::cerr << "Error:  Couldn't find '" << name << "' resource in the resource database!\n";
-     exit (-1);
--      /*  Some compilers aren't smart enough to know that exit() exits.  */
--    return '\0';
-   }
- }
- 
---- xosview-1.9.4/linux/acpitemp.cc.orig       2012-07-09 17:56:42.000000000 +0200
-+++ xosview-1.9.4/linux/acpitemp.cc    2024-02-04 16:31:49.978449947 +0100
-@@ -108,12 +108,12 @@ void ACPITemp::getacpitemp( void ) {
-   std::ifstream high_file(_highfile);
- 
-   if (!temp_file) {
--    std::cerr << "Can not open file : " << temp_file << std::endl;
-+    std::cerr << "Can not open file : " << _tempfile << std::endl;
-     parent_->done(1);
-     return;
-   }
-   if (!high_file) {
--    std::cerr << "Can not open file : " << high_file << std::endl;
-+    std::cerr << "Can not open file : " << _highfile << std::endl;
-     parent_->done(1);
-     return;
-   }

diff --git a/xosview-desktop.patch b/xosview-desktop.patch
new file mode 100644 (file)
index 0000000..1bf66b1
--- /dev/null
+++ b/xosview-desktop.patch
@@ -0,0 +1,15 @@
+--- xosview-1.24/xosview.desktop.orig  2022-01-17 15:27:34.000000000 +0100
++++ xosview-1.24/xosview.desktop       2024-02-04 18:14:58.461590724 +0100
+@@ -1,6 +1,12 @@
+ [Desktop Entry]
+ Name=Xosview
+ Comment=X based system monitor
++Comment[de]=X11-Util zur Anzeige von Systemressourcen
++Comment[es]=Utilitario X11 para visualizar los recursos del sistema
++Comment[fr]=Utilitaire X11 pour visualiser les ressources système
++Comment[pl]=Podgląd statystyk systemowych
++Comment[pt_BR]=Utilitário X11 para visualizar os recursos do sistema
++Comment[tr]=Sistem kaynaklarını denetleyen X11 yardımcı programı
+ Exec=xosview
+ Terminal=false
+ Type=Application

diff --git a/xosview.desktop b/xosview.desktop
deleted file mode 100644 (file)
index 1cb4224..0000000
--- a/xosview.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Xosview
-Comment=OS Stats Viewer
-Comment[de]=X11-Util zur Anzeige von Systemressourcen
-Comment[es]=Utilitario X11 para visualizar los recursos del sistema
-Comment[fr]=Utilitaire X11 pour visualiser les ressources système
-Comment[pl]=Podgląd statystyk systemowych
-Comment[pt_BR]=Utilitário X11 para visualizar os recursos do sistema
-Comment[tr]=Sistem kaynaklarını denetleyen X11 yardımcı programı
-Exec=xosview
-Icon=xosview
-Terminal=false
-Type=Application
-Categories=System;Monitor;
-# vi: encoding=utf-8

diff --git a/xosview.png b/xosview.png
deleted file mode 100644 (file)
index 1960aa9..0000000
Binary files a/xosview.png and /dev/null differ

diff --git a/xosview.spec b/xosview.spec
index 8ba92026836cbf14500767afef2c78c755df04c1..929caccfe7fa2367ea8ff28439ded55e04f5554d 100644 (file)
--- a/xosview.spec
+++ b/xosview.spec
@@ -7,18 +7,14 @@ Summary(pt_BR.UTF-8): Utilitário X11 para visualizar os recursos do sistema
 Summary(tr.UTF-8):     Sistem kaynaklarını denetleyen X11 yardımcı programı
 Summary(zh_CN.UTF-8):  系统资源的图形监视工具
 Name:          xosview
-Version:       1.9.4
+Version:       1.24
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://www.pogo.org.uk/~mark/xosview/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 8b76425db68c8146ac10e8e123af60ba
-Source1:       %{name}.desktop
-Source2:       %{name}.png
-Patch0:                %{name}-c++.patch
+# Source0-md5: 3da6fe20bba2539255e9349762ebe0d8
+Patch0:                %{name}-desktop.patch
 URL:           https://xosview.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: libstdc++-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXpm-devel
@@ -76,15 +72,13 @@ kullanımı) küçük bir pencerede grafik ortamda sunar.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdefsdir},%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT%{_appdefsdir}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        PREFIX=%{_prefix}
 
 cp -p Xdefaults $RPM_BUILD_ROOT%{_appdefsdir}/XOsview
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +88,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING COPYING.BSD README README.linux TODO
 %attr(755,root,root) %{_bindir}/xosview
 %{_desktopdir}/xosview.desktop
-%{_pixmapsdir}/xosview.png
+%{_iconsdir}/hicolor/32x32/apps/xosview.png
 %{_appdefsdir}/XOsview
 %{_mandir}/man1/xosview.1*