[gnome-panel/f14/master] fix linking

[Matthias Clasen]

commit 4d57c981b18e1b33ff3a567f5fb71d57b5ec6290
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 29 12:47:23 2010 -0400

    fix linking

 gnome-panel-libs.patch |   62 +++++++-----------------------------------------
 gnome-panel.spec       |    3 ++
 2 files changed, 12 insertions(+), 53 deletions(-)
---
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 734ad25..3c6e134 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,57 +1,13 @@
-diff -up gnome-panel-2.31.2/configure.ac.libs gnome-panel-2.31.2/configure.ac
---- gnome-panel-2.31.2/configure.ac.libs	2010-05-26 14:17:31.000000000 -0400
-+++ gnome-panel-2.31.2/configure.ac	2010-05-28 01:06:01.347433767 -0400
-@@ -72,7 +72,7 @@ dnl pkg-config dependency checks
+diff -up gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs gnome-panel-2.32.0.2/gnome-panel/Makefile.am
+--- gnome-panel-2.32.0.2/gnome-panel/Makefile.am.libs	2010-09-29 12:46:06.995194003 -0400
++++ gnome-panel-2.32.0.2/gnome-panel/Makefile.am	2010-09-29 12:46:30.476194003 -0400
+@@ -147,7 +147,8 @@ gnome_desktop_item_edit_SOURCES =	\
  
- PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
- 
--PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk)
-+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 dbus-1)
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
- 
-@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
-   X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
- ])
- 
--AC_SUBST(X_LIBS)
--
- dnl X RANDR extension
- 
--if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
--	AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
--	have_randr=yes
--else
--	have_randr=no
--fi
-+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
-+  AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-+  have_randr=yes
-+  X_LIBS="$X_LIBS $XRANDR_LIBS"
-+], [
-+  have_randr=no
-+])
-+
-+AC_SUBST(X_LIBS)
- 
- dnl Modules dir
- AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
-diff -up gnome-panel-2.31.2/gnome-panel/Makefile.am.libs gnome-panel-2.31.2/gnome-panel/Makefile.am
---- gnome-panel-2.31.2/gnome-panel/Makefile.am.libs	2010-05-26 11:13:52.000000000 -0400
-+++ gnome-panel-2.31.2/gnome-panel/Makefile.am	2010-05-28 01:01:38.674674304 -0400
-@@ -152,6 +152,7 @@ gnome_panel_LDADD =		\
- 	$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la	\
- 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la			\
- 	$(PANEL_LIBS)									\
-+	-lm 	\
- 	$(X_LIBS)
- 
- gnome_panel_LDFLAGS = -export-dynamic
-@@ -168,6 +169,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor
  gnome_desktop_item_edit_LDADD = 	\
  	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
- 	$(PANEL_LIBS)			\
-+	-lm	\
- 	$(X_LIBS)
+-	$(PANEL_LIBS)
++	$(PANEL_LIBS) \
++	$(X_LIBS)
  
- uidir = $(datadir)/gnome-panel/ui
+ panel_test_applets_SOURCES =		\
+ 	panel-modules.c			\
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5880836..46b651a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -123,6 +123,8 @@ Patch45: icon-padding.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=537798
 Patch47: fix-clock-crash.patch
 
+Patch48: gnome-panel-libs.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -169,6 +171,7 @@ Panel Applets using the libpanel-applet library.
 %patch43 -p1 -b .panel-padding
 %patch45 -p1 -b .icon-padding
 %patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .libs
 
 cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} m4