[packages/xosview] - updated to 1.9.4

[qboosh]

commit 944ccd3c07098980567a0f971efb043b7465afc9
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Sun Feb 4 17:54:09 2024 +0100

    - updated to 1.9.4

 xosview-c++.patch | 44 ++++++++++++++++----------------------------
 xosview.spec      | 34 ++++++++++++++--------------------
 2 files changed, 30 insertions(+), 48 deletions(-)
---
diff --git a/xosview.spec b/xosview.spec
index 8b943fe..8ba9202 100644
--- a/xosview.spec
+++ b/xosview.spec
@@ -7,12 +7,12 @@ 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.8.4
+Version:       1.9.4
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       
https://downloads.sourceforge.net/xosview/%{name}-%{version}.tar.gz
-# Source0-md5: 173b9f8b7a41c3212ad5b48ac7f4c76b
+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
@@ -67,30 +67,24 @@ kullanımı) küçük bir pencerede grafik ortamda sunar.
 %setup -q
 %patch0 -p1
 
-# --- XXX Cruft Alert!
-ln -sf config/configure.in .
-sed -e '/EXTRA_CXXFLAGS/ s/ -O3/ %{rpmcxxflags} %{rpmcppflags}/' 
config/aclocal.m4 > acinclude.m4
-
 %build
-%{__aclocal}
-%{__autoconf}
-cp -f %{_datadir}/automake/config.sub config
-%configure
-
-%{__make}
+%{__make} \
+       CXX="%{__cxx}" \
+       LDFLAGS="%{rpmldflags}" \
+       OPTFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
+       PLATFORM=linux
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_appdefsdir}}
+install -d $RPM_BUILD_ROOT{%{_appdefsdir},%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
-       PREFIX_TO_USE=$RPM_BUILD_ROOT%{_prefix} \
-       MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
-       XAPPLOADDIR=$RPM_BUILD_ROOT%{_appdefsdir}
+       DESTDIR=$RPM_BUILD_ROOT \
+       PREFIX=%{_prefix}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+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
diff --git a/xosview-c++.patch b/xosview-c++.patch
index 0f030c6..f41e3c1 100644
--- a/xosview-c++.patch
+++ b/xosview-c++.patch
@@ -9,32 +9,20 @@
    }
  }
  
---- xosview-1.8.4/linux/lmstemp.cc.orig        2015-06-04 18:10:58.000000000 
+0200
-+++ xosview-1.8.4/linux/lmstemp.cc     2024-02-04 12:53:45.486001390 +0100
-@@ -154,7 +154,7 @@ void LmsTemp::getlmstemp( void ){
-     std::ifstream file( _filename );
+--- 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 ( !file ){
--      std::cerr <<"Can not open file : " <<file << std::endl;
-+      std::cerr <<"Can not open file : " <<_filename << std::endl;
-       parent_->done(1);
-       return;
-     }
-@@ -169,7 +169,7 @@ void LmsTemp::getlmstemp( void ){
-       strcpy(p, "_input");
-       std::ifstream file1(f);
-       if ( !file1 ){
--        std::cerr <<"Can not open file : " <<file1 << std::endl;
-+        std::cerr <<"Can not open file : " <<f << std::endl;
-         parent_->done(1);
-         return;
-       }
-@@ -178,7 +178,7 @@ void LmsTemp::getlmstemp( void ){
-       strcpy(p, "_max");
-       std::ifstream file2(f);
-       if ( !file2 ){
--        std::cerr <<"Can not open file : " <<file2 << std::endl;
-+        std::cerr <<"Can not open file : " <<f << std::endl;
-         parent_->done(1);
-         return;
-       }
+   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;
+   }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xosview.git/commitdiff/944ccd3c07098980567a0f971efb043b7465afc9

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit