2.31.91

5 files changed, 57 insertions, 68 deletions

diff --git a/.gitignore b/.gitignore
index 9b1b3a0..2dd930a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gnome-applets-2.31.5.tar.bz2
 gnome-applets-2.31.6.tar.bz2
 /gnome-applets-2.31.90.1.tar.bz2
+/gnome-applets-2.31.91.tar.bz2
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
index 211e035..b4297ce 100644
--- a/gnome-applets-libs.patch
+++ b/gnome-applets-libs.patch
@@ -1,10 +1,9 @@
-diff -up gnome-applets-2.29.5/configure.in.libs gnome-applets-2.29.5/configure.in
-diff -up gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs gnome-applets-2.29.5/cpufreq/src/Makefile.am
---- gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs	2010-02-14 15:23:17.133904122 -0500
-+++ gnome-applets-2.29.5/cpufreq/src/Makefile.am	2010-02-14 15:23:51.214903773 -0500
-@@ -32,7 +32,8 @@ cpufreq_applet_LDADD =  \
- 	$(GNOME_APPLETS_LIBS)   	\
- 	$(GNOME_LIBS2_LIBS)		\
+diff -up gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs gnome-applets-2.31.90.1/cpufreq/src/Makefile.am
+--- gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs	2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/cpufreq/src/Makefile.am	2010-08-19 20:02:09.776849002 -0400
+@@ -31,7 +31,8 @@ cpufreq_applet_SOURCES =  \
+ cpufreq_applet_LDADD =  \
+ 	$(GNOME_APPLETS3_LIBS)   	\
  	$(LIBGLADE_LIBS)		\
 -	$(LIBCPUFREQ_LIBS)
 +	$(LIBCPUFREQ_LIBS)		\
@@ -12,39 +11,39 @@ diff -up gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs gnome-applets-2.29.5/
  
  	
  
-diff -up gnome-applets-2.29.5/geyes/Makefile.am.libs gnome-applets-2.29.5/geyes/Makefile.am
---- gnome-applets-2.29.5/geyes/Makefile.am.libs	2010-02-14 14:27:43.528930009 -0500
-+++ gnome-applets-2.29.5/geyes/Makefile.am	2010-02-14 14:27:54.382903748 -0500
-@@ -17,7 +17,8 @@ geyes_applet2_SOURCES =	\
+diff -up gnome-applets-2.31.90.1/geyes/Makefile.am.libs gnome-applets-2.31.90.1/geyes/Makefile.am
+--- gnome-applets-2.31.90.1/geyes/Makefile.am.libs	2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/geyes/Makefile.am	2010-08-19 20:02:37.640849001 -0400
+@@ -16,7 +16,8 @@ geyes_applet2_SOURCES =	\
+ 	geyes.h
  
  geyes_applet2_LDADD = 		\
- 	$(GNOME_APPLETS_LIBS)	\
--	$(GNOME_LIBS2_LIBS)
-+	$(GNOME_LIBS2_LIBS)	\
+-	$(GNOME_APPLETS3_LIBS)
++	$(GNOME_APPLETS3_LIBS)	\
 +	-lm
  
- serverdir       = $(libdir)/bonobo/servers
- server_in_files = GNOME_GeyesApplet.server.in
-diff -up gnome-applets-2.29.5/multiload/Makefile.am.libs gnome-applets-2.29.5/multiload/Makefile.am
---- gnome-applets-2.29.5/multiload/Makefile.am.libs	2010-02-14 14:55:18.556153943 -0500
-+++ gnome-applets-2.29.5/multiload/Makefile.am	2010-02-14 15:10:36.987158084 -0500
-@@ -25,7 +25,8 @@ multiload_applet_2_LDADD = \
- 				$(GNOME_APPLETS_LIBS) 	\
+ appletdir       = $(datadir)/gnome-panel/applets
+ applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
+diff -up gnome-applets-2.31.90.1/multiload/Makefile.am.libs gnome-applets-2.31.90.1/multiload/Makefile.am
+--- gnome-applets-2.31.90.1/multiload/Makefile.am.libs	2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/multiload/Makefile.am	2010-08-19 20:03:22.087849003 -0400
+@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
+ multiload_applet_2_LDADD = \
+ 				$(GNOME_APPLETS3_LIBS) 	\
  				$(GTOP_APPLETS_LIBS)	\
- 				$(GNOMEDESKTOP_LIBS)    \
--				$(GNOME_LIBS2_LIBS)
-+				$(GNOME_LIBS2_LIBS)	\
+-				$(GNOMEDESKTOP_LIBS)
++				$(GNOMEDESKTOP_LIBS)	\
 +				-lm
  
  schemasdir   = @GCONF_SCHEMA_FILE_DIR@
  schemas_in_files = multiload.schemas.in
-diff -up gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs gnome-applets-2.29.5/trashapplet/src/Makefile.am
---- gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs	2010-02-14 14:41:41.502904384 -0500
-+++ gnome-applets-2.29.5/trashapplet/src/Makefile.am	2010-02-14 14:42:17.442905215 -0500
-@@ -15,6 +15,7 @@ trashapplet_SOURCES = \
+diff -up gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs gnome-applets-2.31.90.1/trashapplet/src/Makefile.am
+--- gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs	2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/trashapplet/src/Makefile.am	2010-08-19 20:03:52.609849003 -0400
+@@ -14,6 +14,7 @@ trashapplet_SOURCES = \
+ 
  trashapplet_LDADD = 		\
- 	$(GNOME_APPLETS_LIBS) 	\
- 	$(GNOME_LIBS2_LIBS)	\
+ 	$(GNOME_APPLETS3_LIBS) 	\
 -	$(GIO_LIBS)
 +	$(GIO_LIBS)		\
 +	-lX11
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cad003d..f9a84ee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,8 +32,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.31.90.1
-Release:        2%{?dist}
+Version:	2.31.91
+Release:        1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -43,10 +43,7 @@ Source: 	http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.b
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 
-Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
-Patch2:		gnome-applets-2.23.3-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
-Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
 Patch34:        ppp-includes.patch
 Patch35:        modemlights-libgnome.patch
@@ -132,9 +129,6 @@ and more.
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-old-modemlights
-%patch2 -p1 -b .use-builtin-apm
-%patch11 -p1 -b .dont-require-display
 
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
@@ -169,23 +163,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dyn
 
 make
 
-# 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$" POTFILES.in > POTFILES.keep
-# some files go missing due to our modemlights surgery
-grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
-mv POTFILES.keep2 POTFILES.in
-intltool-update --pot
-for p in *.po; do
-  msgmerge $p %{po_package}.pot > $p.out
-  msgfmt -o `basename $p .po`.gmo $p.out
-done
-
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -218,9 +196,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
 rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
@@ -337,6 +312,9 @@ fi
 
 
 %changelog
+* Tue Aug 31 2010 Matthias Clasen <mclasen@redhat.com> - 1:2.31.91-1
+- Update to 2.31.91
+
 * Thu Aug 19 2010 Matthias Clasen <mclasen@redhat.com> - 1:2.31.90.1-1
 - Update to 2.31.90.1
 
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
index 65bc674..24a63f8 100644
--- a/modemlights-libgnome.patch
+++ b/modemlights-libgnome.patch
@@ -1,9 +1,9 @@
-diff -up gnome-applets-2.29.5/configure.in.modemlights-libgnome gnome-applets-2.29.5/configure.in
---- gnome-applets-2.29.5/configure.in.modemlights-libgnome	2010-01-17 16:37:16.249288488 -0500
-+++ gnome-applets-2.29.5/configure.in	2010-01-17 16:39:50.185529959 -0500
-@@ -120,6 +120,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
- AC_SUBST(GNOME_APPLETS_CFLAGS)
- AC_SUBST(GNOME_APPLETS_LIBS)
+diff -up gnome-applets-2.31.90.1/configure.in.modemlights-libgnome gnome-applets-2.31.90.1/configure.in
+--- gnome-applets-2.31.90.1/configure.in.modemlights-libgnome	2010-08-18 18:30:01.000000000 -0400
++++ gnome-applets-2.31.90.1/configure.in	2010-08-19 23:38:59.508849002 -0400
+@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan
+ AC_SUBST(GNOME_APPLETS3_CFLAGS)
+ AC_SUBST(GNOME_APPLETS3_LIBS)
  
 +dnl -- check for libgnome (required) ------------------------------------------
 +PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
@@ -13,9 +13,9 @@ diff -up gnome-applets-2.29.5/configure.in.modemlights-libgnome gnome-applets-2.
  dnl -- check for gnome-desktop (required) -------------------------------------
  PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
  AC_SUBST(GNOMEDESKTOP_CFLAGS)
-diff -up gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.29.5/modemlights/Makefile.am
---- gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome	2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.29.5/modemlights/Makefile.am	2010-01-17 16:37:16.326303959 -0500
+diff -up gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.90.1/modemlights/Makefile.am
+--- gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome	2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.31.90.1/modemlights/Makefile.am	2010-08-19 23:38:59.509849002 -0400
 @@ -2,6 +2,7 @@ SUBDIRS = docs
  
  INCLUDES = -I. -I$(srcdir) 				\
@@ -32,3 +32,15 @@ diff -up gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome gnome
  		     $(GNOME_APPLETS_LIBS)
  
  uidir		= $(datadir)/gnome-2.0/ui
+diff -up gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.90.1/po/POTFILES.in
+--- gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome	2010-08-18 18:09:58.000000000 -0400
++++ gnome-applets-2.31.90.1/po/POTFILES.in	2010-08-19 23:41:28.694849003 -0400
+@@ -72,7 +72,7 @@ mixer/applet.c
+ mixer/dock.c
+ mixer/load.c
+ mixer/mixer.schemas.in
+-mixer/org.gnome.applets.MixerApplet.panel-applet.in.in
++[type: gettext/ini]mixer/org.gnome.applets.MixerApplet.panel-applet.in.in
+ mixer/preferences.c
+ modemlights/modem-applet.c
+ [type: gettext/glade]modemlights/modemlights.ui
diff --git a/sources b/sources
index eb43230..263d208 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-540a0c6c25619e33443c4f35e96b1758  gnome-applets-2.31.90.1.tar.bz2
-ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
+43bce1a45b32ae8e7d00cd8ed8df2ec1  gnome-applets-2.31.91.tar.bz2