[gthumb] - Merge-review cleanup (#225670)

[paragn]

commit 8c53dc8a520efdc5aaca3a4cc5c29432a2634333
Author: paragn <paragn at fedoraproject.org>
Date:   Mon Oct 4 10:18:41 2010 +0530

    - Merge-review cleanup (#225670)

 gthumb.spec |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)
---
diff --git a/gthumb.spec b/gthumb.spec
index 3964a4f..014ac16 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,35 +1,25 @@
-
-%define gtk2_version 2.16.0
-%define glib2_version 2.16.0
-%define unique_version 1.1.2
-%define openraw_version 0.0.8
-%define exiv2_version 0.18
-%define clutter_version 1.0.0
-%define clutter_gtk_version 0.10.0
-%define gstreamer_version 0.10
-
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.11.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
 
 License: GPLv2+
 Group: User Interface/X
 
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk2-devel 
+BuildRequires: glib2-devel 
 BuildRequires: GConf2, GConf2-devel
-BuildRequires: unique-devel >= %{unique_version}
-BuildRequires: exiv2-devel >= %{exiv2_version}
-BuildRequires: libopenraw-gnome-devel >= %{openraw_version}
-BuildRequires: clutter-devel >= %{clutter_version}
-BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
-BuildRequires: gstreamer-devel >= %{gstreamer_version}
-BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_version}
+BuildRequires: unique-devel 
+BuildRequires: exiv2-devel 
+Buildrequires: libopenraw-gnome-devel
+BuildRequires: clutter-devel
+BuildRequires: clutter-gtk-devel
+BuildRequires: gstreamer-devel 
+BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: intltool
-BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: gnome-doc-utils 
 BuildRequires: libSM-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
@@ -72,7 +62,7 @@ rm -f data/gthumb.schemas
 autoreconf -i -f
 
 %build
-%configure --enable-libopenraw
+%configure --enable-libopenraw --disable-static
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -82,12 +72,12 @@ make %{?_smp_mflags}
 
 %install
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-find $RPM_BUILD_ROOT -name "*.a" -exec rm {} \;
-find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %find_lang %{name} --with-gnome
 
@@ -128,6 +118,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gthumb-2.12.pc
 
 %changelog
+* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.11.91-3
+- Merge-review cleanup (#225670)
+
 * Thu Sep 02 2010 Christian Krause <chkr at fedoraproject.org> - 2.11.91-2
 - Rebuild against new clutter