rpms/gnome-utils/devel gnome-utils-linking.patch, NONE, 1.1 gnome-utils.spec, 1.213, 1.214

Sun Jun 20 03:00:22 UTC 2010

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22727

Modified Files:
	gnome-utils.spec 
Added Files:
	gnome-utils-linking.patch 
Log Message:
reduce overlinking


gnome-utils-linking.patch:
 baobab/src/Makefile.am           |    2 +-
 gnome-dictionary/src/Makefile.am |    2 ++
 gnome-screenshot/Makefile.am     |    2 +-
 gsearchtool/Makefile.am          |    1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE gnome-utils-linking.patch ---
diff -up gnome-utils-2.30.0/baobab/src/Makefile.am.linking gnome-utils-2.30.0/baobab/src/Makefile.am
--- gnome-utils-2.30.0/baobab/src/Makefile.am.linking	2010-06-19 22:53:12.119416772 -0400
+++ gnome-utils-2.30.0/baobab/src/Makefile.am	2010-06-19 22:53:32.177166948 -0400
@@ -45,7 +45,7 @@ baobab_CFLAGS = 			\
 	$(LIBGTOP_CFLAGS)		\
 	$(NULL)
 
-baobab_LDFLAGS = -export-dynamic
+baobab_LDFLAGS = -export-dynamic -Wl,-O1,--as-needed
 baobab_LDADD = 				\
 	-lm				\
 	$(GNOME_UTILS_LIBS)		\
diff -up gnome-utils-2.30.0/gnome-dictionary/src/Makefile.am.linking gnome-utils-2.30.0/gnome-dictionary/src/Makefile.am
--- gnome-utils-2.30.0/gnome-dictionary/src/Makefile.am.linking	2010-03-30 10:26:34.000000000 -0400
+++ gnome-utils-2.30.0/gnome-dictionary/src/Makefile.am	2010-06-19 22:46:23.894414468 -0400
@@ -45,6 +45,7 @@ gnome_dictionary_LDADD = \
 	$(top_builddir)/gnome-dictionary/libgdict/libgdict-1.0.la \
 	$(GNOME_UTILS_LIBS) \
 	$(NULL)
+gnome_dictionary_LDFLAGS = -Wl,-O1,--as-needed
 
 if BUILD_GDICT_APPLET
 
@@ -78,5 +79,6 @@ gnome_dictionary_applet_LDADD = \
 	$(GNOME_UTILS_LIBS) \
 	$(APPLET_LIBS) \
 	$(NULL)
+gnome_dictionary_applet_LDFLAGS = -Wl,-O1,--as-needed
 
 endif # BUILD_GDICT_APPLET
diff -up gnome-utils-2.30.0/gnome-screenshot/Makefile.am.linking gnome-utils-2.30.0/gnome-screenshot/Makefile.am
--- gnome-utils-2.30.0/gnome-screenshot/Makefile.am.linking	2010-06-19 22:54:00.422166808 -0400
+++ gnome-utils-2.30.0/gnome-screenshot/Makefile.am	2010-06-19 22:54:27.584419567 -0400
@@ -28,7 +28,7 @@ gnome_screenshot_SOURCES = \
 	screenshot-xfer.h		\
 	$(NULL)
 
-gnome_screenshot_LDFLAGS = -export-dynamic
+gnome_screenshot_LDFLAGS = -export-dynamic -Wl,-O1,--as-needed
 
 gnome_screenshot_LDADD =		\
 	$(XSHAPE_LIBS)			\
diff -up gnome-utils-2.30.0/gsearchtool/Makefile.am.linking gnome-utils-2.30.0/gsearchtool/Makefile.am
--- gnome-utils-2.30.0/gsearchtool/Makefile.am.linking	2010-06-19 22:54:45.207195443 -0400
+++ gnome-utils-2.30.0/gsearchtool/Makefile.am	2010-06-19 22:55:18.428423058 -0400
@@ -38,6 +38,7 @@ gnome_search_tool_LDADD =            \
 	$(GIO_UNIX_LIBS)             \
 	$(libgnomeui_deprecated_LIB) \
 	$(libeggsmclient_LIB)
+gnome_search_tool_LDFLAGS = -Wl,-O1,--as-needed
 
 man_MANS = gnome-search-tool.1
 


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- gnome-utils.spec	30 Mar 2010 21:29:27 -0000	1.213
+++ gnome-utils.spec	20 Jun 2010 03:00:22 -0000	1.214
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.30.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        GNOME utility programs
 
@@ -23,6 +23,8 @@ Patch0:      spinner.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=597435
 Patch2:      selfshot.patch
 
+Patch3:      gnome-utils-linking.patch
+
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires:    glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -87,6 +89,7 @@ view various system log files.
 %setup -q
 %patch0 -p1 -b .spinner
 %patch2 -p1 -b .selfshot
+%patch3 -p1 -b .linking
 
 # Hide from menus
 pushd gsearchtool
@@ -98,6 +101,7 @@ autoreconf -f -i
 
 %build
 %configure --disable-scrollkeeper --enable-console-helper
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 make %{?_smp_mflags}
 
 # strip unneeded translations from .mo files
@@ -114,18 +118,16 @@ done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # make gnome-system-log use consolehelper until it starts using polkit
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-/bin/cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
 #%%PAM-1.0
 auth      include      config-util
 account      include      config-util
@@ -133,7 +135,7 @@ session      include      config-util
 EOF
 
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
-/bin/cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
 USER=root
 PROGRAM=/usr/sbin/gnome-system-log
 SESSION=true
@@ -141,8 +143,8 @@ FALLBACK=true
 EOF
 
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sbindir}
-/bin/mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}
-/bin/ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/gnome-system-log
+mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}
+ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/gnome-system-log
 
 
 desktop-file-install --vendor gnome --delete-original       \
@@ -187,9 +189,6 @@ cat baobab.lang >> gnome-utils-2.0.lang
 cat gnome-dictionary.lang >> gnome-utils-2.0.lang
 cat gnome-search-tool.lang >> gnome-utils-2.0.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post
 /sbin/ldconfig
@@ -312,6 +311,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Sat Jun 19 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.30.0-2
+- Reduce overlinking
+
 * Tue Mar 30 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.30.0-1
 - Update to 2.30.0
 

