diff --git a/xosview-1.17-typo.patch b/xosview-1.17-typo.patch new file mode 100644 index 0000000..15c7a3a --- /dev/null +++ b/xosview-1.17-typo.patch @@ -0,0 +1,19 @@ +diff --git a/linux/acpitemp.cc b/linux/acpitemp.cc +index 9a53af5..ec39da2 100644 +--- a/linux/acpitemp.cc ++++ b/linux/acpitemp.cc +@@ -118,12 +118,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.spec b/xosview.spec index bb06229..8d24aa8 100644 --- a/xosview.spec +++ b/xosview.spec @@ -1,7 +1,7 @@ Summary: An X Window System utility for monitoring system resources Name: xosview Version: 1.17 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/System # The netbsd/swapinternal.{cc,h} source files are BSD only (with # advertising), but neither file is used in the linux version of @@ -15,6 +15,7 @@ Source0: http://www.pogo.org.uk/~mark/xosview/releases/xosview-%{version}. Source1: http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png Patch0: xosview-1.11-app-def.patch Patch1: xosview-aarch64.patch +Patch2: xosview-1.17-typo.patch BuildRequires: libXpm-devel BuildRequires: libX11-devel BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ etc. Xosview runs under the X Window System. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" @@ -63,6 +65,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop %{_datadir}/X11/app-defaults/XOsview %changelog +* Sat Feb 06 2016 Terje Rosten - 1.17-3 +- Add patch to fix FTBFS with gcc 6 + * Fri Feb 05 2016 Fedora Release Engineering - 1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild