rpms/gnome-screensaver/devel picky-ld.patch, NONE, 1.1 gnome-screensaver.spec, 1.230, 1.231

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10376

Modified Files:
	gnome-screensaver.spec 
Added Files:
	picky-ld.patch 
Log Message:
Try to handle toolchain changes


picky-ld.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE picky-ld.patch ---
diff -up gnome-screensaver-2.28.0/src/Makefile.am.picky-ld gnome-screensaver-2.28.0/src/Makefile.am
--- gnome-screensaver-2.28.0/src/Makefile.am.picky-ld	2009-11-06 18:13:33.256494763 -0500
+++ gnome-screensaver-2.28.0/src/Makefile.am	2009-11-06 18:15:24.527465877 -0500
@@ -201,6 +201,7 @@ gnome_screensaver_SOURCES =	\
 
 gnome_screensaver_gl_helper_LDADD =	\
 	$(GNOME_SCREENSAVER_LIBS)	\
+	-lX11				\
 	$(GL_LIBS)			\
 	$(NULL)
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- gnome-screensaver.spec	6 Nov 2009 22:59:02 -0000	1.230
+++ gnome-screensaver.spec	6 Nov 2009 23:21:54 -0000	1.231
@@ -35,6 +35,8 @@ Patch11: ask-to-die.patch
 Patch12: remove-session-inhibits.patch
 # from upstream
 Patch13: 0001-Add-an-API-to-show-a-message-on-the-locked-screen.patch
+# GRR
+Patch14: picky-ld.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -92,14 +94,11 @@ simple, sane, secure defaults and be wel
 %patch11 -p1 -b .ask-to-die
 %patch12 -p1 -b .remove-session-inhibits
 %patch13 -p1 -b .message-api
+%patch14 -p1 -b .picky-ld
 
-libtoolize --force --copy
+autoreconf -f -i
 
 %build
-# grr, autoreconf seems to break with intltool 0.36.0, unless
-# you intltoolize again
-intltoolize --force
-autoreconf
 %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
            --with-xscreensaverhackdir=/usr/libexec/xscreensaver  \
            --with-gdm-config=/usr/share/gdm/defaults.conf        \