Hello community, here is the log from the commit of package xosview for openSUSE:Factory checked in at 2017-03-24 02:22:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xosview (Old) and /work/SRC/openSUSE:Factory/.xosview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xosview" Fri Mar 24 02:22:55 2017 rev:43 rq:482038 version:1.19 Changes: -------- --- /work/SRC/openSUSE:Factory/xosview/xosview.changes 2016-12-06 14:27:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xosview.new/xosview.changes 2017-03-24 02:22:57.620978968 +0100 @@ -1,0 +2,10 @@ +Mon Mar 20 18:50:58 UTC 2017 - [email protected] + +- spec-cleaned, removed limitation to gcc5 + +------------------------------------------------------------------- +Tue Mar 7 08:53:24 UTC 2017 - [email protected] + +- Diskmeter: allow removable devices (boo#1027532) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xosview.spec ++++++ --- /var/tmp/diff_new_pack.cxJWfG/_old 2017-03-24 02:22:58.388870316 +0100 +++ /var/tmp/diff_new_pack.cxJWfG/_new 2017-03-24 02:22:58.388870316 +0100 @@ -1,7 +1,7 @@ # # spec file for package xosview # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,8 @@ # +%define _appdefdir %{_datadir}/X11/app-defaults Name: xosview -BuildRequires: autoconf -BuildRequires: gcc5-c++ -BuildRequires: pkgconfig -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xpm) -# NOTE: We don't want this dependency and desktop-data-SuSE is in all -# desktop selections. -#Requires: desktop-data-SuSE -# /usr/bin/xrdb -Requires: xrdb Version: 1.19 Release: 0 Summary: System Load Information @@ -42,8 +33,17 @@ Patch0: xosview-1.19.dif Patch10: xosview-1.19-appdef.patch Patch11: xosview-1.16-diskstat.patch +BuildRequires: autoconf +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xpm) +# NOTE: We don't want this dependency and desktop-data-SuSE is in all +# desktop selections. +#Requires: desktop-data-SuSE +# /usr/bin/xrdb +Requires: xrdb BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define _appdefdir %{_datadir}/X11/app-defaults %description A small program which is mostly configurable using resources via @@ -52,30 +52,29 @@ %prep %setup -q -%patch10 -p0 -b .appdef -%patch11 -p0 -b .diskstat -%patch0 -p0 -b .p0 +%patch10 -b .appdef +%patch11 -b .diskstat +%patch0 -b .p0 %build - OPTFLAGS="$RPM_OPT_FLAGS" - CXX=g++-5 -export OPTFLAGS CXX -case "$RPM_OPT_FLAGS" in + OPTFLAGS="%{optflags}" +export OPTFLAGS +case "%{optflags}" in *-fno-const-strings*) ;; *) if $CXX $OPTFLAGS -fno-const-strings -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then OPTFLAGS="$OPTFLAGS -fno-const-strings" fi esac -make clean -make PLATFORM=linux OPTFLAGS="$OPTFLAGS" PREFIX=%{_exec_prefix} USE_SYSCALLS=1 +make %{?_smp_mflags} clean +make %{?_smp_mflags} PLATFORM=linux OPTFLAGS="$OPTFLAGS" PREFIX=%{_prefix} USE_SYSCALLS=1 %install mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_appdefdir} mkdir -p %{buildroot}%{_docdir}/xosview -make PREFIX=%{_exec_prefix} \ +make PREFIX=%{_prefix} \ MANDIR=%{_mandir} \ XAPPLOADDIR=%{_appdefdir} \ USE_SYSCALLS=1 \ @@ -85,7 +84,7 @@ install -m 0444 README %{buildroot}%{_docdir}/xosview/ install -m 0444 README.linux %{buildroot}%{_docdir}/xosview/ mv %{buildroot}%{_bindir}/xosview %{buildroot}%{_bindir}/xosview.bin -sed 's|@@BINDIR@@|%{_bindir}|' < %{S:4} > %{buildroot}%{_bindir}/xosview +sed 's|@@BINDIR@@|%{_bindir}|' < %{SOURCE4} > %{buildroot}%{_bindir}/xosview chmod 0755 %{buildroot}%{_bindir}/xosview chmod 0755 %{buildroot}%{_bindir}/xosview.bin mkdir -p %{buildroot}%{_datadir}/pixmaps @@ -101,7 +100,7 @@ %{_bindir}/xosview.bin %dir %{_appdefdir} %config %{_appdefdir}/XOsview -%doc %{_mandir}/man1/xosview.1.gz +%{_mandir}/man1/xosview.1%{ext_man} %dir %{_docdir}/xosview/ %doc %{_docdir}/xosview/README %doc %{_docdir}/xosview/README.linux ++++++ xosview-1.16-diskstat.patch ++++++ --- /var/tmp/diff_new_pack.cxJWfG/_old 2017-03-24 02:22:58.420865789 +0100 +++ /var/tmp/diff_new_pack.cxJWfG/_new 2017-03-24 02:22:58.420865789 +0100 @@ -49,7 +49,7 @@ if (strncmp(dirent->d_name, ".", 1) == 0 || strncmp(dirent->d_name, "..", 2) == 0 || strncmp(dirent->d_name, "loop", 4) == 0 || -@@ -302,11 +301,52 @@ void DiskMeter::getsysfsdiskinfo( void ) +@@ -302,11 +301,36 @@ void DiskMeter::getsysfsdiskinfo( void ) disk = sysfs_dir + dirent->d_name; if (stat(disk.c_str(), &buf) == 0 && buf.st_mode & S_IFDIR) { @@ -60,22 +60,6 @@ if (lstat(tmp.c_str(), &buf) != 0 || (buf.st_mode & S_IFLNK) == 0) continue; -+ // ignore removable devices -+ tmp = disk + "/removable"; -+ if (stat(tmp.c_str(), &buf) == 0 && buf.st_mode & S_IFREG) { -+ std::ifstream removable; -+ int isremovable = 0; -+ -+ removable.open(tmp.c_str()); -+ if (removable.good()) { -+ removable >> isremovable; -+ removable.close(); -+ removable.clear(); -+ } -+ if (isremovable) -+ continue; -+ } -+ + tmp = "/dev/"; + tmp += dirent->d_name; + if (lstat(tmp.c_str(), &buf) == 0) @@ -89,7 +73,7 @@ + hw_sectors_kb.open(tmp.c_str()); + if (hw_sectors_kb.good()) { + hw_sectors_kb >> sect_size; -+ //XOSDEBUG("disk stat: %lu\n", sect_size); ++ XOSDEBUG("disk stat: %lu\n", sect_size); + hw_sectors_kb.close(); + hw_sectors_kb.clear(); + } @@ -102,7 +86,7 @@ // is a dir, locate 'stat' file in it disk += "/stat"; diskstat.open(disk.c_str()); -@@ -317,8 +357,8 @@ void DiskMeter::getsysfsdiskinfo( void ) +@@ -317,8 +341,8 @@ void DiskMeter::getsysfsdiskinfo( void ) vals[i] = strtoul(cur, &end, 10); cur = end; }
