rpms/metacity/F-13 libs.patch,NONE,1.1 metacity.spec,1.211,1.212

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16251

Modified Files:
	metacity.spec 
Added Files:
	libs.patch 
Log Message:
fix build


libs.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libs.patch ---
diff -up metacity-2.28.1/src/tools/Makefile.am.libs metacity-2.28.1/src/tools/Makefile.am
--- metacity-2.28.1/src/tools/Makefile.am.libs	2010-02-26 23:00:43.446410930 -0500
+++ metacity-2.28.1/src/tools/Makefile.am	2010-02-26 23:00:55.805414773 -0500
@@ -26,7 +26,7 @@ noinst_PROGRAMS=metacity-mag metacity-gr
 
 metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
 metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
-metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
+metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm
 metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
 
 EXTRA_DIST=$(icon_DATA)


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-13/metacity.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- metacity.spec	27 Jan 2010 14:35:31 -0000	1.211
+++ metacity.spec	27 Feb 2010 04:18:27 -0000	1.212
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -37,6 +37,8 @@ Patch21: Dont-warn-about-a-missing-sessi
 Patch24: metacity-2.28-empty-keybindings.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604319
 Patch25: metacity-2.28-xioerror-unknown-display.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=611260
+Patch26: libs.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -112,6 +114,7 @@ API. This package exists purely for tech
 %patch21 -p1 -b .missing-session
 %patch24 -p1 -b .empty-keybindings
 %patch25 -p1 -b .xioerror-unknown-display
+%patch26 -p1 -b .libs
 
 # force regeneration
 rm src/metacity.schemas
@@ -219,6 +222,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Feb 26 2010 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
+- Fix linking with pedantic linkers
+
 * Wed Jan 27 2010 Owen Taylor <otaylor at redhat.com> - 2.28.1-2
 - Update to 2.28.1, remove 7 patches now applied upstream