rpms/gnome-panel/devel gnome-panel-libs.patch, NONE, 1.1 gnome-panel.spec, 1.375, 1.376
Matthias Clasen
mclasen at fedoraproject.org
Fri Feb 12 04:22:54 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19147
Modified Files:
gnome-panel.spec
Added Files:
gnome-panel-libs.patch
Log Message:
make ld happy
gnome-panel-libs.patch:
configure.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE gnome-panel-libs.patch ---
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:14:01.436008069 -0500
@@ -251,14 +251,16 @@ 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])
+ PKG_CHECK_MODULES(RANDR, xrandr)
+ X_LIBS="$X_LIBS $RANDR_LIBS"
fi
+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.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- gnome-panel.spec 12 Feb 2010 03:53:20 -0000 1.375
+++ gnome-panel.spec 12 Feb 2010 04:22:54 -0000 1.376
@@ -129,6 +129,8 @@ Patch46: resolution-change.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
@@ -180,6 +182,7 @@ Panel Applets using the libpanel-applet
%patch45 -p1 -b .icon-padding
%patch46 -p1 -b .resolution-change
%patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .libs
. %{SOURCE6}
More information about the scm-commits
mailing list