2.31.2gnome-panel-2_31_2-1_fc14

4 files changed, 52 insertions, 69 deletions

diff --git a/.cvsignore b/.cvsignore
index 769a13c..d2ffb67 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.30.0.tar.bz2
+gnome-panel-2.31.2.tar.bz2
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index b3b57ad..90ba286 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,42 +1,16 @@
-diff -up gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs gnome-panel-2.29.92.1/applets/clock/Makefile.am
---- gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs	2010-03-11 22:23:51.692914036 -0500
-+++ gnome-panel-2.29.92.1/applets/clock/Makefile.am	2010-03-11 22:38:20.988697805 -0500
-@@ -65,8 +65,9 @@ CLOCK_LDADD =						\
- 	../../libpanel-applet/libpanel-applet-2.la	\
- 	$(CLOCK_LIBS)					\
- 	$(LIBPANEL_APPLET_LIBS)				\
--	$(POLKIT_LIBS)				\
--	-lgweather
-+	$(POLKIT_LIBS)					\
-+	-lgweather					\
-+	-lm
+diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in
+--- gnome-panel-2.31.2/configure.in.libs	2010-05-26 14:17:31.000000000 -0400
++++ gnome-panel-2.31.2/configure.in	2010-05-28 01:06:01.347433767 -0400
+@@ -72,7 +72,7 @@ dnl pkg-config dependency checks
  
- BUILT_SOURCES =					\
- 	clock-marshallers.c			\
-@@ -134,7 +135,8 @@ gnome_clock_applet_mechanism_INCLUDES =	
- 
- gnome_clock_applet_mechanism_LDADD =	\
- 	$(CLOCK_MECHANISM_LIBS)		\
--	$(POLKIT_LIBS)
-+	$(POLKIT_LIBS)			\
-+	-lm
- 
- if CLOCK_INPROCESS
- APPLET_TYPE     = shlib
-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 22:11:11.098665958 -0500
-@@ -72,6 +72,9 @@ dnl pkg-config dependency checks
  PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
  
- PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED 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 libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk)
-+
-+PANEL_LIBS="$PANEL_LIBS -lm"
-+
+-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 +259,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
+@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
    X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
  ])
  
@@ -60,6 +34,24 @@ diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure
 +
 +AC_SUBST(X_LIBS)
  
- dnl IDL directories
- 
-diff -up gnome-panel-2.29.92.1/gnome-panel/Makefile.am.libs gnome-panel-2.29.92.1/gnome-panel/Makefile.am
+ 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)
+ 
+ uidir = $(datadir)/gnome-panel/ui
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c2cc784..724d9cb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,11 +21,11 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.30.0
-Release: 2%{?dist}
+Version: 2.31.2
+Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
-Source0: http://download.gnome.org/sources/gnome-panel/2.30/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -102,7 +102,7 @@ Patch10: preferred-apps.patch
 # don't pop up an error dialog if an applet from the
 # default configuration is missing; we don't want to
 # add a hard dependency on e.g. tomboy
-Patch11: applet-error.patch
+#Patch11: applet-error.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -165,39 +165,21 @@ Panel Applets using the libpanel-applet library.
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
-%patch11 -p1 -b .applet-error
+#%patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch38 -p1 -b .clock-network
 %patch40 -p1 -b .clock-home
 %patch41 -p1 -b .bookmarks-submenu
 %patch43 -p1 -b .panel-padding
-%patch45 -p1 -b .icon-padding
+#%patch45 -p1 -b .icon-padding
 %patch47 -p1 -b .fix-clock-crash
 %patch48 -p1 -b .libs
 
-. %{SOURCE6}
-
 cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} m4
 cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
 
-libtoolize -f
-aclocal -I m4
-automake
-autoconf
-
-# strip unneeded translations from .mo files
-# ideally intltool (ha!) would do that for us
-# http://bugzilla.gnome.org/show_bug.cgi?id=474987
-cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep
-mv POTFILES.keep POTFILES.in
-intltool-update --pot
-for p in *.po; do
-  msgmerge $p %{gettext_package}.pot > $p.out
-  msgfmt -o `basename $p .po`.gmo $p.out
-done
-
+autoreconf -i -f
 
 %build
 %configure \
@@ -236,8 +218,10 @@ sed -e 's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/
 sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|; s|<default>1</default>|<default>2</default>|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
 
 ## blow away stuff we don't want
-/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-3.*a
+
 
 desktop-file-install --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -245,9 +229,6 @@ desktop-file-install --delete-original \
 
 %find_lang %{gettext_package} --all-name --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
@@ -359,26 +340,36 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_bindir}/gnome-panel
 %{_bindir}/gnome-desktop-item-edit
 %{_libexecdir}/*
-%{_libdir}/bonobo/servers/*.server
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/gconf/schemas/*.entries
+%{_libdir}/gnome-panel
 
 %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
 %{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+
 %files libs
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %{_bindir}/panel-test-applets
+%{_bindir}/panel-test-applets-bonobo
 %{_libdir}/pkgconfig/*
+%{_includedir}/gnome-panel-3.0/libpanel-applet
 %{_includedir}/panel-2.0
 %{_libdir}/*.so
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri May 28 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-1
+- Update to 2.31.2
+
 * Sun May 09 2010 Matthew Barnes <mbarnes@redhat.com> 2.30.0-2
 - Rebuild against newer libedataserver and libedataserverui.
 
diff --git a/sources b/sources
index 995a6f3..4c8f3bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e17f25417b2c9011ed1c3ebd75706de6  gnome-panel-2.30.0.tar.bz2
+17faacecd3081453b7e3fa8418a46058  gnome-panel-2.31.2.tar.bz2