rpms/gnome-applets/devel gnome-applets-2.23.3-use-builtin-apm.patch, NONE, 1.1 .cvsignore, 1.64, 1.65 gnome-applets-2.3.6-ppp-command.patch, 1.3, 1.4 gnome-applets.spec, 1.289, 1.290 gweather-network.patch, 1.2, 1.3 sources, 1.69, 1.70 gnome-applets-2.10.1-use-builtin-apm.patch, 1.1, NONE gnome-applets-2.21.1-mixer-sync.patch, 1.1, NONE gnome-applets-2.21.4-cpufreq.patch, 1.1, NONE gweather-gnome-vfs.patch, 1.3, NONE mixer-wakeups.patch, 1.1, NONE

Tue Aug 5 03:32:21 UTC 2008

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14444

Modified Files:
	.cvsignore gnome-applets-2.3.6-ppp-command.patch 
	gnome-applets.spec gweather-network.patch sources 
Added Files:
	gnome-applets-2.23.3-use-builtin-apm.patch 
Removed Files:
	gnome-applets-2.10.1-use-builtin-apm.patch 
	gnome-applets-2.21.1-mixer-sync.patch 
	gnome-applets-2.21.4-cpufreq.patch gweather-gnome-vfs.patch 
	mixer-wakeups.patch 
Log Message:
2.23.4


gnome-applets-2.23.3-use-builtin-apm.patch:

--- NEW FILE gnome-applets-2.23.3-use-builtin-apm.patch ---
diff -up gnome-applets-2.23.3/configure.in.use-builtin-apm gnome-applets-2.23.3/configure.in
--- gnome-applets-2.23.3/configure.in.use-builtin-apm	2008-07-31 21:52:11.000000000 -0400
+++ gnome-applets-2.23.3/configure.in	2008-07-31 21:53:29.000000000 -0400
@@ -414,12 +414,10 @@ if test x$disable_battstat = xno; then
    case "${host}" in
        powerpc-*-linux*)
            NEED_LIBAPM=yes
-           AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
 	   ;;
        # list of supported OS cores that use libapm
        *-*-linux*)
 	   NEED_LIBAPM=yes
-	   AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
 	   ;;
        # list of supported OS cores that do not use libapm
        i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	18 Jun 2008 16:47:54 -0000	1.64
+++ .cvsignore	5 Aug 2008 03:31:51 -0000	1.65
@@ -1 +1 @@
-gnome-applets-2.23.3.tar.bz2
+gnome-applets-2.23.4.tar.bz2

gnome-applets-2.3.6-ppp-command.patch:

Index: gnome-applets-2.3.6-ppp-command.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets-2.3.6-ppp-command.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applets-2.3.6-ppp-command.patch	26 Apr 2005 15:54:15 -0000	1.3
+++ gnome-applets-2.3.6-ppp-command.patch	5 Aug 2008 03:31:51 -0000	1.4
@@ -1,5 +1,6 @@
---- gnome-applets-2.3.6/modemlights/modemlights.schemas.in	2003-08-18 14:18:22.000000000 +0200
-+++ gnome-applets-2.3.6/modemlights/modemlights.schemas.in	2003-08-18 14:18:59.000000000 +0200
+diff -up gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command gnome-applets-2.23.4/modemlights/modemlights.schemas.in
+--- gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command	2003-07-26 08:50:45.000000000 -0400
++++ gnome-applets-2.23.4/modemlights/modemlights.schemas.in	2008-08-04 23:27:17.000000000 -0400
 @@ -27,7 +27,7 @@
          <key>/schemas/apps/modemlights/prefs/connect</key>
          <owner>modemlights_applet2</owner>
@@ -8,7 +9,7 @@
 +        <default>/sbin/ifup ppp0</default>
          <locale name="C">
            <short>Command executed when connecting</short>
-           <long></long>
+           <long>Use this command to connect the modem.</long>
 @@ -38,7 +38,7 @@
          <key>/schemas/apps/modemlights/prefs/disconnect</key>
          <owner>modemlights_applet2</owner>
@@ -17,4 +18,4 @@
 +        <default>/sbin/ifdown ppp0</default>
          <locale name="C">
            <short>Command executed when disconnecting</short>
-           <long></long>
+           <long>Use this command to disconnect the modem.</long>


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- gnome-applets.spec	23 Jul 2008 16:19:16 -0000	1.289
+++ gnome-applets.spec	5 Aug 2008 03:31:51 -0000	1.290
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.23.3
-Release: 	3%{?dist}
+Version:	2.23.4
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -46,7 +46,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
-Patch2:		gnome-applets-2.10.1-use-builtin-apm.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
 
@@ -56,23 +56,14 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=428072
 Patch33:	gnome-applets-2.18.0-node-leak.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=370937
-# Patch34:	mixer-wakeups.patch
-
 Patch34:        ppp-includes.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
-Patch35:	gnome-applets-2.21.1-mixer-sync.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=488824
 Patch39:	gweather-network.patch
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=511446
-Patch44:	gweather-gnome-vfs.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -156,10 +147,8 @@
 
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
-%patch35 -p1 -b .mixer-sync
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
-%patch44 -p1 -b .gweather-gnome-vfs
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -319,6 +308,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Mon Aug  4 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.4-1
+- Update to 2.23.4
+
 * Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.23.3-3
 - fix license tag
 

gweather-network.patch:

Index: gweather-network.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gweather-network.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gweather-network.patch	16 Jan 2008 05:48:15 -0000	1.2
+++ gweather-network.patch	5 Aug 2008 03:31:51 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-applets-2.21.2/gweather/gweather-applet.c
---- gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network	2007-11-27 03:59:41.000000000 -0500
-+++ gnome-applets-2.21.2/gweather/gweather-applet.c	2008-01-05 23:05:00.000000000 -0500
+diff -up gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network gnome-applets-2.23.3/gweather/gweather-applet.c
+--- gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network	2008-06-11 02:34:08.000000000 -0400
++++ gnome-applets-2.23.3/gweather/gweather-applet.c	2008-07-31 21:58:21.000000000 -0400
 @@ -29,6 +29,10 @@
  #include <libnotify/notification.h>
  #endif
@@ -9,10 +9,10 @@
 +#include <dbus/dbus-glib-lowlevel.h>
 +#include <NetworkManager/NetworkManager.h>
 +
+ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+ 
  #include "gweather.h"
- #include "gweather-about.h"
- #include "gweather-pref.h"
-@@ -288,6 +292,8 @@ applet_destroy (GtkWidget *widget, GWeat
+@@ -289,6 +293,8 @@ applet_destroy (GtkWidget *widget, GWeat
      weather_info_abort (gw_applet->gweather_info);
  }
  
@@ -21,7 +21,7 @@
  void gweather_applet_create (GWeatherApplet *gw_applet)
  {
      AtkObject *atk_obj;
-@@ -323,7 +329,7 @@ void gweather_applet_create (GWeatherApp
+@@ -324,7 +330,7 @@ void gweather_applet_create (GWeatherApp
      g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
                         GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
      g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",           
@@ -30,7 +30,7 @@
                       
      gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
  
-@@ -353,9 +359,9 @@ void gweather_applet_create (GWeatherApp
+@@ -354,9 +360,9 @@ void gweather_applet_create (GWeatherApp
  					  NULL);
      }
  	
@@ -43,7 +43,7 @@
  }
  
  gint timeout_cb (gpointer data)
-@@ -520,3 +526,88 @@ void gweather_update (GWeatherApplet *gw
+@@ -521,3 +527,88 @@ void gweather_update (GWeatherApplet *gw
  						    update_finish, gw_applet);
      }
  }


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	18 Jun 2008 22:10:02 -0000	1.69
+++ sources	5 Aug 2008 03:31:51 -0000	1.70
@@ -1,2 +1,2 @@
-ea5de6ff5400a0e70df78efab902a76e  gnome-applets-2.23.3.tar.bz2
+e1ff4f88761faaa0dd46294c471ec7c0  gnome-applets-2.23.4.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2


--- gnome-applets-2.10.1-use-builtin-apm.patch DELETED ---


--- gnome-applets-2.21.1-mixer-sync.patch DELETED ---


--- gnome-applets-2.21.4-cpufreq.patch DELETED ---


--- gweather-gnome-vfs.patch DELETED ---


--- mixer-wakeups.patch DELETED ---


