diff --git a/.gitignore b/.gitignore index bf3aefb..c373503 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ geeqie-1.0.tar.gz /geeqie-v1.2.1.tar.xz /geeqie-1.2.2.tar.xz /geeqie-1.3.tar.xz +/geeqie-1.4.tar.xz diff --git a/geeqie-1.4-Wno-unused-but-set-variable.patch b/geeqie-1.4-Wno-unused-but-set-variable.patch new file mode 100644 index 0000000..4b47c7a --- /dev/null +++ b/geeqie-1.4-Wno-unused-but-set-variable.patch @@ -0,0 +1,11 @@ +--- geeqie-1.4.orig/configure.in 2017-12-31 07:31:21.000000000 -0500 ++++ geeqie-1.4/configure.in 2018-01-01 14:26:40.782261872 -0500 +@@ -18,7 +18,7 @@ + AC_INIT([geeqie], 1.4, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/]) + + # Add -Werror to the default CFLAGS +-CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type" ++CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type -Wno-unused-but-set-variable" + + # Check for rightly dirs + AC_CONFIG_SRCDIR([src/main.c]) diff --git a/geeqie.spec b/geeqie.spec index 7bb4dc2..1dea566 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -4,8 +4,8 @@ Summary: Image browser and viewer Name: geeqie -Version: 1.3 -Release: 5%{?dist} +Version: 1.4 +Release: 1%{?dist} License: GPLv2+ Source0: http://geeqie.org/geeqie-%{version}.tar.xz @@ -24,8 +24,14 @@ URL: http://geeqie.org # add -Wl,--as-needed without disturbing %%configure macro Patch0: geeqie-1.1-LDFLAGS.patch -# from http://sources.debian.net/data/main/g/geeqie/1:1.3-1/debian/patches/ -Patch9: geeqie-1.3-bug-800350-libstc++-copy-on-write-string.diff +# add -Wno-unused-but-set-variable because upstream added -Werror (good) +# but we add -Wall so we're more strict. This relaxes that, but we don't +# want to carry this forever. One issue looks likely harmless +# https://github.com/BestImageViewer/geeqie/issues/567 and the other looks like +# probably a bunch of submenus that should be there aren't +# https://github.com/BestImageViewer/geeqie/issues/566 +# .. in any case, we should remove this patch once upstream has that fixed. +Patch1: geeqie-1.4-Wno-unused-but-set-variable.patch BuildRequires: gtk2-devel BuildRequires: lcms2-devel @@ -59,6 +65,7 @@ and zoom. %prep %setup -q +%patch1 -p1 autoreconf -f -i ; intltoolize # guard against missing executables at (re)build-time, # these are needed by the plug-in scripts @@ -71,13 +78,17 @@ for f in ufraw-batch ; do done %endif %patch0 -p1 -%patch9 -p1 + + %build %configure --enable-lirc --disable-tiff \ --with-readmedir=%{_pkgdocdir} make %{?_smp_mflags} +# work around https://github.com/BestImageViewer/geeqie/issues/568 +touch ChangeLog + %install mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}/html @@ -87,7 +98,7 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install [ ! -f ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/index.html ] && exit -1 # We want these _docdir files in GQ_HELPDIR. -install -p -m 0644 AUTHORS COPYING ChangeLog NEWS README* TODO \ +install -p -m 0644 AUTHORS COPYING NEWS README* TODO \ ${RPM_BUILD_ROOT}%{_pkgdocdir} desktop-file-install \ @@ -122,6 +133,16 @@ update-desktop-database &> /dev/null || : %changelog +* Mon Jan 01 2018 Matthew Miller - 1.4-1 +- new upstream release +- drop exiv2 patch libstc++-copy-on-write-string -- now upstream +- add patch to relax warnings on unused-but-set variables -- see + upstream https://github.com/BestImageViewer/geeqie/issues/566 and + https://github.com/BestImageViewer/geeqie/issues/567 +- drop ChangeLog since it's missing from the release tarball, and also we + nominally dropped it from the package in 2008 for being "too low level" + (see earlier rpm changelog entry) + * Wed Aug 02 2017 Fedora Release Engineering - 1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 287ebb6..a287797 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0339ad62946cae7009ec76ec21572065 geeqie-1.3.tar.xz +SHA512 (geeqie-1.4.tar.xz) = a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205