packages (DEVEL): gnome-applets/gnome-applets.spec, gnome-applets/gnome-app...

[lisu]

Author: lisu                         Date: Wed Apr 13 07:58:28 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- try to force support for gnome-panel-3

---- Files affected:
packages/gnome-applets:
   gnome-applets.spec (1.234.2.1 -> 1.234.2.2) , gnome-applets-gnome-panel3.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-applets/gnome-applets.spec
diff -u packages/gnome-applets/gnome-applets.spec:1.234.2.1 packages/gnome-applets/gnome-applets.spec:1.234.2.2
--- packages/gnome-applets/gnome-applets.spec:1.234.2.1	Wed Apr 13 09:40:43 2011
+++ packages/gnome-applets/gnome-applets.spec	Wed Apr 13 09:58:23 2011
@@ -13,6 +13,7 @@
 # Source0-md5:	a02e75fe13f29a4863d122c26e3f58b6
 # check paths in Makefile before removing it!
 Patch0:		%{name}-m4_fix.patch
+Patch1:		%{name}-gnome-panel3.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	NetworkManager-devel >= 0.7
@@ -383,6 +384,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -743,6 +745,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.234.2.2  2011/04/13 07:58:23  lisu
+- try to force support for gnome-panel-3
+
 Revision 1.234.2.1  2011/04/13 07:40:43  lisu
 - start update to 2.91.3 (future 3.0)
 

================================================================
Index: packages/gnome-applets/gnome-applets-gnome-panel3.patch
diff -u /dev/null packages/gnome-applets/gnome-applets-gnome-panel3.patch:1.1.2.1
--- /dev/null	Wed Apr 13 09:58:28 2011
+++ packages/gnome-applets/gnome-applets-gnome-panel3.patch	Wed Apr 13 09:58:23 2011
@@ -0,0 +1,22 @@
+--- gnome-applets-2.91.3/configure.in~	2010-11-30 13:10:18.000000000 +0100
++++ gnome-applets-2.91.3/configure.in	2011-04-13 09:55:02.276064304 +0200
+@@ -18,6 +18,7 @@
+ SCROLLKEEPER_REQUIRED=0.1.4
+ LIBPANEL_REQUIRED=2.13.4
+ LIBPANEL3_REQUIRED=2.31.2
++LIBPANEL4_REQUIRED=2.90.0
+ LIBGTOP_REQUIRED=2.11.92
+ LIBXKLAVIER_REQUIRED=4.0
+ LIBWNCK_REQUIRED=2.9.3
+@@ -126,6 +127,11 @@
+ AC_SUBST(GNOME_APPLETS3_CFLAGS)
+ AC_SUBST(GNOME_APPLETS3_LIBS)
+ 
++dnl -- check for libpanelapplet4 (required) ------------------------------------
++PKG_CHECK_MODULES(GNOME_APPLETS4, libpanelapplet-4.0 >= $LIBPANEL4_REQUIRED)
++AC_SUBST(GNOME_APPLETS4_CFLAGS)
++AC_SUBST(GNOME_APPLETS4_LIBS)
++
+ dnl -- check for gnome-desktop (required) -------------------------------------
+ PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
+ AC_SUBST(GNOMEDESKTOP_CFLAGS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-applets/gnome-applets.spec?r1=1.234.2.1&r2=1.234.2.2&f=u