rpms/gnome-applets/devel .cvsignore, 1.72, 1.73 gnome-applets-remove-mixer.patch, 1.3, 1.4 gnome-applets.spec, 1.314, 1.315 sources, 1.79, 1.80
Matthias Clasen
mclasen at fedoraproject.org
Tue Dec 23 03:32:40 UTC 2008
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1791
Modified Files:
.cvsignore gnome-applets-remove-mixer.patch gnome-applets.spec
sources
Log Message:
2.25.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore 13 Nov 2008 04:47:17 -0000 1.72
+++ .cvsignore 23 Dec 2008 03:32:09 -0000 1.73
@@ -1 +1 @@
-gnome-applets-2.25.1.tar.bz2
+gnome-applets-2.25.2.tar.bz2
gnome-applets-remove-mixer.patch:
Index: gnome-applets-remove-mixer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-remove-mixer.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applets-remove-mixer.patch 19 Dec 2008 17:03:01 -0000 1.3
+++ gnome-applets-remove-mixer.patch 23 Dec 2008 03:32:10 -0000 1.4
@@ -1,79 +1,7 @@
-Index: null_applet/GNOME_MixerApplet.server.in
-===================================================================
---- null_applet/GNOME_MixerApplet.server.in (revision 11160)
-+++ null_applet/GNOME_MixerApplet.server.in (working copy)
-@@ -1,28 +1,15 @@
- <oaf_info>
-
--<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
-- type="exe"
-- location="@LIBEXECDIR@/mixer_applet2">
--
-- <oaf_attribute name="repo_ids" type="stringv">
-- <item value="IDL:Bonobo/GenericFactory:1.0"/>
-- <item value="IDL:Bonobo/Unknown:1.0"/>
-- </oaf_attribute>
-- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
-- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
--
--</oaf_server>
--
- <oaf_server iid="OAFIID:GNOME_MixerApplet"
- type="factory"
-- location="OAFIID:GNOME_MixerApplet_Factory">
-+ location="OAFIID:GNOME_NullApplet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
- <item value="IDL:Bonobo/Control:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
-- <oaf_attribute name="name" type="string" _value="Volume Control"/>
-+ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
- <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
- <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-
-Property changes on: null_applet/GNOME_MixerApplet.server.in
-___________________________________________________________________
-Added: svn:mergeinfo
-
-Index: Makefile.am
-===================================================================
---- Makefile.am (revision 11160)
-+++ Makefile.am (working copy)
-@@ -11,12 +11,6 @@
- libgweather_SUBDIRS = $(libgweather_applets)
- endif
-
--mixer_applets = \
-- mixer
--if APPLET_MIXER
--mixer_SUBDIRS = $(mixer_applets)
--endif
--
- modemlights_applets = \
- modemlights
- if APPLET_MODEMLIGHTS
-@@ -56,7 +50,6 @@
- SUBDIRS = \
- po \
- $(always_built_SUBDIRS) \
-- $(mixer_SUBDIRS) \
- $(modemlights_SUBDIRS) \
- $(gtop_SUBDIRS) \
- $(libgweather_SUBDIRS) \
-@@ -69,7 +62,6 @@
-
- DIST_SUBDIRS = \
- po \
-- mixer \
- modemlights \
- drivemount \
- charpick \
---- configure.in.old 2008-12-19 14:49:53.000000000 +0000
-+++ configure.in 2008-12-19 14:50:13.000000000 +0000
-@@ -471,69 +471,6 @@ enable_stickynotes="yes"
+diff -up gnome-applets-2.25.2/configure.in.mixer-null gnome-applets-2.25.2/configure.in
+--- gnome-applets-2.25.2/configure.in.mixer-null 2008-12-20 16:30:09.000000000 -0500
++++ gnome-applets-2.25.2/configure.in 2008-12-20 16:31:52.000000000 -0500
+@@ -483,69 +483,6 @@ enable_stickynotes="yes"
AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
dnl ***************************************************************************
@@ -143,7 +71,7 @@
dnl *** keyboard accessibility status applet check ***
dnl ***************************************************************************
-@@ -758,8 +695,6 @@ accessx-status/pixmaps/Makefile
+@@ -770,8 +707,6 @@ accessx-status/pixmaps/Makefile
mini-commander/Makefile
mini-commander/src/Makefile
mini-commander/help/Makefile
@@ -152,7 +80,7 @@
drivemount/Makefile
drivemount/help/Makefile
modemlights/Makefile
-@@ -833,7 +768,6 @@ gnome-applets-$VERSION configure summary
+@@ -845,7 +780,6 @@ gnome-applets-$VERSION configure summary
- gweather $build_libgweather_applets
- invest-applet $BUILD_INVEST_APPLET
- mini-commander $enable_mini_commander
@@ -160,15 +88,82 @@
- modemlights $BUILD_MODEM_LIGHTS
- multiload $build_gtop_applets
- stickynotes $enable_stickynotes
-@@ -841,6 +775,5 @@ gnome-applets-$VERSION configure summary
-
+@@ -854,6 +788,5 @@ gnome-applets-$VERSION configure summary
Using DBUS: $HAVE_DBUS
+ Using NetworkManager: $HAVE_NETWORKMANAGER
Using HAL: $HAVE_HAL
- Using GStreamer version: $HAVE_GST_VER
Enabling IPv6: $have_ipv6
" >&2
---- null_applet/Makefile.am.old 2008-12-19 14:49:20.000000000 +0000
-+++ null_applet/Makefile.am 2008-12-19 14:50:13.000000000 +0000
+diff -up gnome-applets-2.25.2/Makefile.am.mixer-null gnome-applets-2.25.2/Makefile.am
+--- gnome-applets-2.25.2/Makefile.am.mixer-null 2008-12-20 00:35:19.000000000 -0500
++++ gnome-applets-2.25.2/Makefile.am 2008-12-20 16:30:09.000000000 -0500
+@@ -11,12 +11,6 @@ if BUILD_LIBGWEATHER_APPLETS
+ libgweather_SUBDIRS = $(libgweather_applets)
+ endif
+
+-mixer_applets = \
+- mixer
+-if APPLET_MIXER
+-mixer_SUBDIRS = $(mixer_applets)
+-endif
+-
+ modemlights_applets = \
+ modemlights
+ if APPLET_MODEMLIGHTS
+@@ -56,7 +50,6 @@ always_built_SUBDIRS = \
+ SUBDIRS = \
+ po \
+ $(always_built_SUBDIRS) \
+- $(mixer_SUBDIRS) \
+ $(modemlights_SUBDIRS) \
+ $(gtop_SUBDIRS) \
+ $(libgweather_SUBDIRS) \
+@@ -69,7 +62,6 @@ SUBDIRS = \
+
+ DIST_SUBDIRS = \
+ po \
+- mixer \
+ modemlights \
+ drivemount \
+ charpick \
+diff -up gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in
+--- gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null 2008-12-20 00:34:05.000000000 -0500
++++ gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in 2008-12-20 16:30:09.000000000 -0500
+@@ -1,28 +1,15 @@
+ <oaf_info>
+
+-<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
+- type="exe"
+- location="@LIBEXECDIR@/mixer_applet2">
+-
+- <oaf_attribute name="repo_ids" type="stringv">
+- <item value="IDL:Bonobo/GenericFactory:1.0"/>
+- <item value="IDL:Bonobo/Unknown:1.0"/>
+- </oaf_attribute>
+- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
+- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
+-
+-</oaf_server>
+-
+ <oaf_server iid="OAFIID:GNOME_MixerApplet"
+ type="factory"
+- location="OAFIID:GNOME_MixerApplet_Factory">
++ location="OAFIID:GNOME_NullApplet_Factory">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ <item value="IDL:Bonobo/Control:1.0"/>
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+- <oaf_attribute name="name" type="string" _value="Volume Control"/>
++ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
+ <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+ <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+diff -up gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null gnome-applets-2.25.2/null_applet/Makefile.am
+--- gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null 2008-12-20 16:30:09.000000000 -0500
++++ gnome-applets-2.25.2/null_applet/Makefile.am 2008-12-20 16:30:09.000000000 -0500
@@ -19,6 +19,7 @@ server_in_files = \
GNOME_CDPlayerApplet.server.in \
GNOME_MailcheckApplet_Factory.server.in \
@@ -185,11 +180,22 @@
+ GNOME_BattstatApplet.server.in \
+ GNOME_MixerApplet.server.in
+
-Index: po/POTFILES.in
-===================================================================
---- po/POTFILES.in (revision 11161)
-+++ po/POTFILES.in (working copy)
-@@ -80,13 +80,6 @@
+diff -up gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null gnome-applets-2.25.2/null_applet/null_applet.c
+--- gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null 2008-12-20 16:30:09.000000000 -0500
++++ gnome-applets-2.25.2/null_applet/null_applet.c 2008-12-20 16:30:09.000000000 -0500
+@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
+ "OAFIID:GNOME_CDPlayerApplet", "CD Player");
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+ }
+
+ static gboolean already_running;
+diff -up gnome-applets-2.25.2/po/POTFILES.in.mixer-null gnome-applets-2.25.2/po/POTFILES.in
+--- gnome-applets-2.25.2/po/POTFILES.in.mixer-null 2008-12-20 03:22:15.000000000 -0500
++++ gnome-applets-2.25.2/po/POTFILES.in 2008-12-20 16:30:09.000000000 -0500
+@@ -80,13 +80,6 @@ mini-commander/src/mini-commander-global
mini-commander/src/mini-commander.schemas.in
mini-commander/src/mini-commander_applet.c
mini-commander/src/preferences.c
@@ -203,11 +209,10 @@
modemlights/GNOME_ModemLights.server.in.in
modemlights/GNOME_ModemLights.xml
modemlights/modem-applet.c
-Index: po/POTFILES.skip
-===================================================================
---- po/POTFILES.skip (revision 11161)
-+++ po/POTFILES.skip (working copy)
-@@ -23,7 +23,6 @@
+diff -up gnome-applets-2.25.2/po/POTFILES.skip.mixer-null gnome-applets-2.25.2/po/POTFILES.skip
+--- gnome-applets-2.25.2/po/POTFILES.skip.mixer-null 2008-12-20 00:33:44.000000000 -0500
++++ gnome-applets-2.25.2/po/POTFILES.skip 2008-12-20 16:30:09.000000000 -0500
+@@ -23,7 +23,6 @@ invest-applet/data/Invest_Applet.server.
invest-applet/data/financialchart.glade
invest-applet/data/prefs-dialog.glade
mini-commander/src/mini-commander.glade
@@ -215,14 +220,3 @@
modemlights/GNOME_ModemLights.server.in
modemlights/modemlights.glade
multiload/GNOME_MultiLoadApplet_Factory.server.in
---- null_applet/null_applet.c.mixer-null 2008-12-19 16:59:48.000000000 +0000
-+++ null_applet/null_applet.c 2008-12-19 17:00:26.000000000 +0000
-@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
- "OAFIID:GNOME_CDPlayerApplet", "CD Player");
- g_hash_table_insert (hash_table,
- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
- }
-
- static gboolean already_running;
Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- gnome-applets.spec 19 Dec 2008 17:03:01 -0000 1.314
+++ gnome-applets.spec 23 Dec 2008 03:32:10 -0000 1.315
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.1
-Release: 8%{?dist}
+Version: 2.25.2
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -53,22 +53,13 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=424639
Patch31: gnome-applets-2.18.0-fix-find.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=428072
-Patch33: gnome-applets-2.18.0-node-leak.patch
-
Patch34: ppp-includes.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
# and for the mixer applet
Patch42: gnome-applets-remove-mixer.patch
-# from upstream
-Patch41: gnome-applets-libgnomeui.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -151,12 +142,10 @@
%patch11 -p1 -b .dont-require-display
%patch31 -p1 -b .fix-find
-%patch33 -p1 -b .node-leak
-%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
rm -rf mixer/
-%patch42 -p0 -b .mixer-null
+%patch42 -p1 -b .mixer-null
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -164,7 +153,6 @@
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
-%patch41 -p1 -b .libgnomeui
intltoolize --force
autoreconf
@@ -351,6 +339,9 @@
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sat Dec 20 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-1
+- Update to 2.25.2
+
* Fri Dec 19 2008 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.1-8
- Fix battstat nullification
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources 13 Nov 2008 04:47:18 -0000 1.79
+++ sources 23 Dec 2008 03:32:10 -0000 1.80
@@ -1,2 +1 @@
-5224a0813833767600470603d21189e1 gnome-applets-2.25.1.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+ee040219c868baca6c75c6525a656a0b gnome-applets-2.25.2.tar.bz2
More information about the fedora-extras-commits
mailing list