rpms/gthumb/devel gthumb.spec,1.103,1.104

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19777

Modified Files:
	gthumb.spec 
Log Message:
Drop unneeded direct deps



Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gthumb.spec	25 Jul 2009 01:39:24 -0000	1.103
+++ gthumb.spec	3 Aug 2009 04:47:38 -0000	1.104
@@ -3,15 +3,13 @@
 %define glib2_version 2.4.0
 %define nautilus_version 2.2.0
 %define desktop_file_utils_version 0.9
-%define libgnomeprint_version 2.6.0
-%define libgnomeprintui_version 2.6.0
 %define gphoto_version 2.1.3
 %define gconf_version 2.14
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
@@ -23,8 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: nautilus >= %{nautilus_version}
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires: libexif-devel
 BuildRequires: libiptcdata-devel
 BuildRequires: libopenraw-gnome-devel
@@ -80,7 +76,12 @@ autoreconf -i -f
 %define gphoto_flags  %{nil}
 %endif
 %configure %{gphoto_flags}
-make
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -144,6 +145,9 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/gthumb.png
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-6
+- Drop unneeded direct deps
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild