[geeqie] BR libjpeg-devel libtiff-devel

[Michael Schwendt]

commit e5c8e2a01adeb4a6851162bb0e477108cfa8eeb7
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Aug 14 09:49:35 2012 +0200

    BR libjpeg-devel libtiff-devel
    
    - Upgrade to 1.1 (also to reduce patch count).

 .gitignore                        |    1 +
 geeqie-1.0-LDFLAGS.patch          |   24 ------------
 geeqie-1.0-copy-chown.patch       |   49 -------------------------
 geeqie-1.0-exif-728802.patch      |   11 ------
 geeqie-1.0-exif-filecache.patch   |   12 ------
 geeqie-1.0-filedata-compare.patch |   53 ---------------------------
 geeqie-1.0-lfs-autoconf.patch     |   13 -------
 geeqie-1.0-sidecars-case.patch    |   26 -------------
 geeqie-1.0-ui_pathsel.patch       |   44 ----------------------
 geeqie-1.0-vflist-refresh.patch   |   72 -------------------------------------
 geeqie-1.1-LDFLAGS.patch          |   12 ++++++
 geeqie.spec                       |   46 ++++++------------------
 sources                           |    2 +-
 13 files changed, 25 insertions(+), 340 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f7dbd9..d0b76d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 geeqie-1.0.tar.gz
+/geeqie-1.1.tar.gz
diff --git a/geeqie-1.1-LDFLAGS.patch b/geeqie-1.1-LDFLAGS.patch
new file mode 100644
index 0000000..53d9e33
--- /dev/null
+++ b/geeqie-1.1-LDFLAGS.patch
@@ -0,0 +1,12 @@
+diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/Makefile.in geeqie-1.1/src/Makefile.in
+--- geeqie-1.1-orig/src/Makefile.in	2012-08-12 22:14:07.000000000 +0200
++++ geeqie-1.1/src/Makefile.in	2012-08-14 09:40:29.599433629 +0200
+@@ -233,7 +233,7 @@
+ JPEG_LIBS = @JPEG_LIBS@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+ LCMS_LIBS = @LCMS_LIBS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -Wl,--as-needed
+ LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@
+ LIBCHAMPLAIN_GTK_CFLAGS = @LIBCHAMPLAIN_GTK_CFLAGS@
+ LIBCHAMPLAIN_GTK_LIBS = @LIBCHAMPLAIN_GTK_LIBS@
diff --git a/geeqie.spec b/geeqie.spec
index 603c834..ed74a99 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,42 +1,23 @@
-%define upstreamversion 1.0
+%define upstreamversion 1.1
 
 Summary: Image browser and viewer
 Name: geeqie
-Version: 1.0
-Release: 18%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 License: GPLv3
 Group: User Interface/X
-# svn + autogen
-#Source: geeqie-1.0alpha2-svn-1341.tgz
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
 URL: http://geeqie.sourceforge.net/
 
-# merged in 1.1
-Patch0: geeqie-1.0-lfs-autoconf.patch
-BuildRequires: autoconf
-# obsolete with further changes in 1.1 / reported upstream
-Patch1: geeqie-1.0-exif-filecache.patch
-# obsolete in 1.1 due to complete removal/rewrite
-# bz 632243, reported upstream
-Patch2: geeqie-1.0-sidecars-case.patch
-# as discussed on geeqie devel list and due to further debugging/patching, 
-# won't be needed in 1.1
-Patch3: geeqie-1.0-vflist-refresh.patch
-# obsolete with further changes in 1.1 / bz 728802
-Patch4: geeqie-1.0-exif-728802.patch
-# merged in 1.1 / nadvornik master tree
-Patch5: geeqie-1.0-filedata-compare.patch
-# in 1.1 / upstream stable tree
-Patch6: geeqie-1.0-copy-chown.patch
-Patch7: geeqie-1.0-ui_pathsel.patch
 # add -Wl,--as-needed without disturbing %%configure macro
-# this touches both Makefile.in and Makefile.am as autoreconf is used
-Patch8: geeqie-1.0-LDFLAGS.patch
+Patch0: geeqie-1.1-LDFLAGS.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: exiv2-devel
 BuildRequires: lirc-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
 BuildRequires: gettext intltool desktop-file-utils
 BuildRequires: gnome-doc-utils
 
@@ -69,19 +50,10 @@ and zoom.
 for f in exiftran exiv2 mogrify ufraw-batch zenity ; do
     type $f || exit -1
 done
-%patch0 -p1 -b .lfs-autoconf
-%patch1 -p1 -b .exif-filecache
-%patch2 -p1 -b .sidecars-case
-%patch3 -p1 -b .vflist-refresh
-%patch4 -p1 -b .exif-728802
-%patch5 -p1 -b .filedata-compare
-%patch6 -p1 -b .copy-chown
-%patch7 -p1 -b .ui_pathsel
-%patch8 -p1 -b .LDFLAGS
+%patch0 -p1 -b .LDFLAGS
 
 
 %build
-autoreconf -f
 %configure --enable-lirc
 make %{?_smp_mflags}
 
@@ -127,6 +99,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Aug 14 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-1
+- BR libjpeg-devel libtiff-devel
+- Upgrade to 1.1 (also to reduce patch count).
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 0855585..2e56e00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d67ef990390224c5052697d93bb49c0  geeqie-1.0.tar.gz
+e63351988625c84b0fd80bc4eefd923b  geeqie-1.1.tar.gz