[packages/xosview2] - xosview.spec updated to xosview2 2.3.3 (fork made by the original author, developed independent of
qboosh
qboosh at pld-linux.org
Sun Feb 4 20:29:47 CET 2024
commit dccfbc22497c0e4fb6626adec5b4e0d624e5a7e6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 4 20:14:48 2024 +0100
- xosview.spec updated to xosview2 2.3.3 (fork made by the original author, developed independent of xosview 1.x now)
xosview-c++.patch | 40 --------------------------
xosview.desktop => xosview2.desktop | 4 +--
xosview.png => xosview2.png | Bin
xosview.spec => xosview2.spec | 55 ++++++++++++++++++------------------
4 files changed, 30 insertions(+), 69 deletions(-)
---
diff --git a/xosview.spec b/xosview2.spec
similarity index 73%
rename from xosview.spec
rename to xosview2.spec
index 8b943fe..c8e84aa 100644
--- a/xosview.spec
+++ b/xosview2.spec
@@ -6,21 +6,22 @@ Summary(pl.UTF-8): Narzędzie pod X11 monitorujące zasoby systemowe
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
+Name: xosview2
+Version: 2.3.3
Release: 1
License: GPL v2
Group: X11/Applications
Source0: https://downloads.sourceforge.net/xosview/%{name}-%{version}.tar.gz
-# Source0-md5: 173b9f8b7a41c3212ad5b48ac7f4c76b
+# Source0-md5: 0c2c1f718128982582f88dc516bc00e0
Source1: %{name}.desktop
Source2: %{name}.png
-Patch0: %{name}-c++.patch
URL: https://xosview.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXft-devel
BuildRequires: xorg-lib-libXpm-devel
Requires: xorg-lib-libXt >= 1.0.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,41 +66,41 @@ kullanımı) küçük bir pencerede grafik ortamda sunar.
%prep
%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
+cd config
+%{__autoconf} -Wall configure.in > ../configure
+%{__autoheader}
+%{__mv} config.h.in ..
+cd ..
+chmod 755 configure
+CXXFLAGS="%{rpmcxxflags} -std=c++17"
+%configure \
+ --with-app-defaults=%{_appdefsdir}
%{__make}
%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{%{_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
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+# packaged as doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xosview2
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES COPYING COPYING.BSD README README.linux TODO
-%attr(755,root,root) %{_bindir}/xosview
-%{_desktopdir}/xosview.desktop
-%{_pixmapsdir}/xosview.png
-%{_appdefsdir}/XOsview
-%{_mandir}/man1/xosview.1*
+%doc CHANGES COPYING COPYING.BSD README TODO doc/README.linux
+%attr(755,root,root) %{_bindir}/xosview2
+%{_desktopdir}/xosview2.desktop
+%{_pixmapsdir}/xosview2.png
+%{_appdefsdir}/XOsview2
+%{_mandir}/man1/xosview2.1*
diff --git a/xosview-c++.patch b/xosview-c++.patch
deleted file mode 100644
index 0f030c6..0000000
--- a/xosview-c++.patch
+++ /dev/null
@@ -1,40 +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.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 );
-
- 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;
- }
diff --git a/xosview.desktop b/xosview2.desktop
similarity index 94%
rename from xosview.desktop
rename to xosview2.desktop
index 1cb4224..d863bde 100644
--- a/xosview.desktop
+++ b/xosview2.desktop
@@ -7,8 +7,8 @@ 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
+Exec=xosview2
+Icon=xosview2
Terminal=false
Type=Application
Categories=System;Monitor;
diff --git a/xosview.png b/xosview2.png
similarity index 100%
rename from xosview.png
rename to xosview2.png
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xosview2.git/commitdiff/dccfbc22497c0e4fb6626adec5b4e0d624e5a7e6
More information about the pld-cvs-commit
mailing list