rpms/gnome-applets/devel .cvsignore, 1.75, 1.76 gnome-applets-null-battstat.patch, 1.4, 1.5 gnome-applets.spec, 1.324, 1.325 sources, 1.84, 1.85 trash-init.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	.cvsignore gnome-applets-null-battstat.patch 
	gnome-applets.spec sources 
Removed Files:
	trash-init.patch 
Log Message:
2.25.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	20 Jan 2009 19:18:10 -0000	1.75
+++ .cvsignore	4 Feb 2009 02:07:48 -0000	1.76
@@ -1 +1 @@
-gnome-applets-2.25.4.tar.bz2
+gnome-applets-2.25.90.tar.bz2

gnome-applets-null-battstat.patch:

Index: gnome-applets-null-battstat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-null-battstat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-applets-null-battstat.patch	11 Jan 2009 19:24:13 -0000	1.4
+++ gnome-applets-null-battstat.patch	4 Feb 2009 02:07:48 -0000	1.5
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null	2009-01-11 11:32:02.651110416 -0500
-+++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-11 11:47:13.000000000 -0500
+diff -up /dev/null gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null	2009-02-03 19:10:33.912072100 -0500
++++ gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in	2009-02-03 20:59:23.000000000 -0500
 @@ -0,0 +1,22 @@
 +<oaf_info>
 +
@@ -24,29 +24,32 @@
 +</oaf_server>
 +
 +</oaf_info>
-diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
---- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null	2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-11 11:47:13.000000000 -0500
-@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
- 
- null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+diff -up gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null gnome-applets-2.25.90/null_applet/Makefile.am
+--- gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null	2009-01-26 19:05:02.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/Makefile.am	2009-02-03 21:04:50.000000000 -0500
+@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
+ mixer_server_in = GNOME_MixerApplet.server.in
+ endif
  
 +if !BUILD_BATTSTAT_APPLET
 +battstat_applet=GNOME_BattstatApplet.server.in
 +endif
 +
- serverdir = $(libdir)/bonobo/servers
- server_in_files =				\
+ libexec_PROGRAMS = null_applet
+ 
+ null_applet_SOURCES = null_applet.c
+@@ -19,7 +23,7 @@ server_in_files =				\
  	GNOME_NullApplet_Factory.server.in	\
  	GNOME_CDPlayerApplet.server.in		\
  	GNOME_MailcheckApplet_Factory.server.in	\
 -	GNOME_Panel_WirelessApplet.server.in	\
- 	GNOME_MixerApplet.server.in
++	$(battstat_applet)			\
+ 	$(mixer_server_in)
  server_DATA = $(server_in_files:.server.in=.server)
  
-diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
---- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null	2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-11 11:57:57.000000000 -0500
+diff -up gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null gnome-applets-2.25.90/null_applet/null_applet.c
+--- gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null	2009-01-07 00:22:38.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/null_applet.c	2009-02-03 20:59:23.000000000 -0500
 @@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
  	g_hash_table_insert (hash_table,
  			"OAFIID:GNOME_CDPlayerApplet", "CD Player");


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- gnome-applets.spec	21 Jan 2009 15:43:14 -0000	1.324
+++ gnome-applets.spec	4 Feb 2009 02:07:48 -0000	1.325
@@ -34,7 +34,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.4
+Version:	2.25.90
 Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
@@ -59,9 +59,6 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
-# upstream fix
-Patch41:	trash-init.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -145,7 +142,6 @@
 
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .trash-init
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -340,6 +336,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Feb  3 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.90-1
+- Update to 2.25.90
+
 * Wed Jan 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-2
 - Fix trash applet not starting up
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	20 Jan 2009 19:18:10 -0000	1.84
+++ sources	4 Feb 2009 02:07:48 -0000	1.85
@@ -1,2 +1,2 @@
-a9e69b2625137950a175d1e1d134f81e  gnome-applets-2.25.4.tar.bz2
+6669b857554fc7c1216ad29b828a1a01  gnome-applets-2.25.90.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2


--- trash-init.patch DELETED ---