rpms/gnome-panel/devel gnome-panel-libs.patch, 1.2, 1.3 gnome-panel.spec, 1.381, 1.382

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-panel-libs.patch gnome-panel.spec 
Log Message:
fix linking


gnome-panel-libs.patch:
 configure.in |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Index: gnome-panel-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-libs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-panel-libs.patch	12 Feb 2010 04:37:43 -0000	1.2
+++ gnome-panel-libs.patch	12 Mar 2010 02:40:07 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.29.6/configure.in.libs gnome-panel-2.29.6/configure.in
---- gnome-panel-2.29.6/configure.in.libs	2010-02-11 23:09:20.086009297 -0500
-+++ gnome-panel-2.29.6/configure.in	2010-02-11 23:35:24.292035257 -0500
-@@ -251,14 +251,18 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
+diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure.in
+--- gnome-panel-2.29.92.1/configure.in.libs	2010-03-11 21:31:25.628657996 -0500
++++ gnome-panel-2.29.92.1/configure.in	2010-03-11 21:34:12.907695990 -0500
+@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
    X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
  ])
  
@@ -9,16 +9,21 @@ diff -up gnome-panel-2.29.6/configure.in
 -
  dnl X RANDR extension
  
- if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
- 	AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-+        PKG_CHECK_MODULES(RANDR, xrandr)
-+        X_LIBS="$X_LIBS $RANDR_LIBS"
- fi
- 
-+AC_SUBST(X_LIBS)
-+
-+LIBS="$LIBS -lm"
+-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 >= 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 IDL directories
  
- ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- gnome-panel.spec	12 Mar 2010 01:30:00 -0000	1.381
+++ gnome-panel.spec	12 Mar 2010 02:40:07 -0000	1.382
@@ -122,6 +122,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
@@ -171,6 +173,7 @@ Panel Applets using the libpanel-applet 
 %patch43 -p1 -b .panel-padding
 %patch45 -p1 -b .icon-padding
 %patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .libss
 
 . %{SOURCE6}