From dd661c01103fa1f4920b63341b70b109ee1f3cd3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Mar 2010 03:52:56 +0000 Subject: 2.30.0 --- gnome-applets-null-battstat.patch | 39 ++++++++++++++++++++-------------- gnome-applets.spec | 10 ++++++--- sources | 3 ++- stickynotes-null.patch | 44 +++++++++++++++++++++++---------------- 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch index 7fbfaca..760bc1c 100644 --- a/gnome-applets-null-battstat.patch +++ b/gnome-applets-null-battstat.patch @@ -1,6 +1,6 @@ -diff -up /dev/null gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in ---- /dev/null 2009-04-12 17:29:07.367057280 -0400 -+++ gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in 2009-04-13 00:29:58.095336633 -0400 +diff -up gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in +--- gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null 2010-03-28 23:21:03.987012192 -0400 ++++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in 2010-03-28 23:21:03.988012052 -0400 @@ -0,0 +1,22 @@ + + @@ -24,9 +24,9 @@ diff -up /dev/null gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server. + + + -diff -up gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null gnome-applets-2.26.1/null_applet/Makefile.am ---- gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null 2009-03-16 19:38:50.000000000 -0400 -+++ gnome-applets-2.26.1/null_applet/Makefile.am 2009-04-13 00:29:58.096337117 -0400 +diff -up gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null gnome-applets-2.30.0/null_applet/Makefile.am +--- gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null 2010-03-28 01:29:51.000000000 -0400 ++++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:23:29.771762645 -0400 @@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET mixer_server_in = GNOME_MixerApplet.server.in endif @@ -38,22 +38,29 @@ diff -up gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null gnome-applet 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 \ +@@ -21,6 +25,7 @@ server_in_files = \ GNOME_MailcheckApplet_Factory.server.in \ -- GNOME_Panel_WirelessApplet.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_KeyboardApplet.server.in \ + $(battstat_applet) \ $(mixer_server_in) server_DATA = $(server_in_files:.server.in=.server) -diff -up gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null gnome-applets-2.26.1/null_applet/null_applet.c ---- gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null 2009-04-12 21:09:18.000000000 -0400 -+++ gnome-applets-2.26.1/null_applet/null_applet.c 2009-04-13 00:31:10.112337087 -0400 -@@ -44,6 +44,8 @@ insert_oafiids (GHashTable *hash_table) - "OAFIID:GNOME_MixerApplet_Factory", _("Volume Control")); - g_hash_table_insert (hash_table, +@@ -39,6 +44,7 @@ EXTRA_DIST = \ + GNOME_MailcheckApplet_Factory.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_MixerApplet.server.in \ ++ GNOME_BattstatApplet.server.in \ + GNOME_KeyboardApplet.server.in + + -include $(top_srcdir)/git.mk +diff -up gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null gnome-applets-2.30.0/null_applet/null_applet.c +--- gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null 2010-03-28 01:29:51.000000000 -0400 ++++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:24:15.766774031 -0400 +@@ -46,6 +46,8 @@ insert_oafiids (GHashTable *hash_table) "OAFIID:GNOME_MixerApplet", _("Volume Control")); + g_hash_table_insert (hash_table, + "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); + g_hash_table_insert (hash_table, + "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor"); } diff --git a/gnome-applets.spec b/gnome-applets.spec index 17b6dc4..62c4476 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -32,13 +32,14 @@ Summary: Small applications for the GNOME panel Name: gnome-applets -Version: 2.29.5 -Release: 3%{?dist} +Version: 2.30.0 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ -Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 +# VCS: git:git://git.gnome.org/gnome-applets +Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2 @@ -344,6 +345,9 @@ fi %changelog +* Sun Mar 28 2010 Matthias Clasen - 1:2.30.0-1 +- Update to 2.30.0 + * Sun Feb 14 2010 Matthias Clasen - 1:2.29.5-2 - Add missing libs diff --git a/sources b/sources index 008ae07..fa4e3fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -0bd6c765fe5e5514a1fa69d7088cc1b0 gnome-applets-2.29.5.tar.bz2 +2afcbedc10b1a0e8072ac4eefdc8d770 gnome-applets-2.30.0.tar.bz2 ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 + diff --git a/stickynotes-null.patch b/stickynotes-null.patch index 3be27f9..810d874 100644 --- a/stickynotes-null.patch +++ b/stickynotes-null.patch @@ -1,7 +1,7 @@ -diff -up gnome-applets-2.27.3/Makefile.am.stickynotes-null gnome-applets-2.27.3/Makefile.am ---- gnome-applets-2.27.3/Makefile.am.stickynotes-null 2009-06-03 21:38:36.000000000 -0400 -+++ gnome-applets-2.27.3/Makefile.am 2009-06-17 14:53:55.169810518 -0400 -@@ -46,7 +46,6 @@ always_built_SUBDIRS = \ +diff -up gnome-applets-2.30.0/Makefile.am.stickynotes-null gnome-applets-2.30.0/Makefile.am +--- gnome-applets-2.30.0/Makefile.am.stickynotes-null 2010-03-28 01:29:51.000000000 -0400 ++++ gnome-applets-2.30.0/Makefile.am 2010-03-28 23:24:47.360759295 -0400 +@@ -42,7 +42,6 @@ always_built_SUBDIRS = \ geyes \ mini-commander \ gkb-new \ @@ -9,9 +9,9 @@ diff -up gnome-applets-2.27.3/Makefile.am.stickynotes-null gnome-applets-2.27.3/ trashapplet \ null_applet -diff -up /dev/null gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.server.in ---- /dev/null 2009-06-17 09:23:25.885275610 -0400 -+++ gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.server.in 2009-06-17 15:04:20.931811206 -0400 +diff -up gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in +--- gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null 2010-03-28 23:24:47.362759364 -0400 ++++ gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in 2010-03-28 23:24:47.363762926 -0400 @@ -0,0 +1,17 @@ + + @@ -30,23 +30,31 @@ diff -up /dev/null gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.serv + + + -diff -up gnome-applets-2.27.3/null_applet/Makefile.am.stickynotes-null gnome-applets-2.27.3/null_applet/Makefile.am ---- gnome-applets-2.27.3/null_applet/Makefile.am.stickynotes-null 2009-06-17 14:53:55.151807673 -0400 -+++ gnome-applets-2.27.3/null_applet/Makefile.am 2009-06-17 14:53:55.171812401 -0400 -@@ -23,6 +23,7 @@ server_in_files = \ - GNOME_NullApplet_Factory.server.in \ - GNOME_CDPlayerApplet.server.in \ +diff -up gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null gnome-applets-2.30.0/null_applet/Makefile.am +--- gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null 2010-03-28 23:24:47.000000000 -0400 ++++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:26:45.638021343 -0400 +@@ -25,6 +25,7 @@ server_in_files = \ GNOME_MailcheckApplet_Factory.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_KeyboardApplet.server.in \ + GNOME_StickyNotesApplet.server.in \ $(battstat_applet) \ $(mixer_server_in) server_DATA = $(server_in_files:.server.in=.server) -diff -up gnome-applets-2.27.3/null_applet/null_applet.c.stickynotes-null gnome-applets-2.27.3/null_applet/null_applet.c ---- gnome-applets-2.27.3/null_applet/null_applet.c.stickynotes-null 2009-06-17 14:53:55.152817798 -0400 -+++ gnome-applets-2.27.3/null_applet/null_applet.c 2009-06-17 14:53:55.173825460 -0400 -@@ -45,7 +45,9 @@ insert_oafiids (GHashTable *hash_table) +@@ -44,6 +45,7 @@ EXTRA_DIST = \ + GNOME_MailcheckApplet_Factory.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_MixerApplet.server.in \ ++ GNOME_StickyNotesApplet.server.in \ + GNOME_BattstatApplet.server.in \ + GNOME_KeyboardApplet.server.in + +diff -up gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null gnome-applets-2.30.0/null_applet/null_applet.c +--- gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null 2010-03-28 23:24:47.000000000 -0400 ++++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:27:18.451011564 -0400 +@@ -47,7 +47,9 @@ insert_oafiids (GHashTable *hash_table) g_hash_table_insert (hash_table, - "OAFIID:GNOME_MixerApplet", _("Volume Control")); + "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); g_hash_table_insert (hash_table, - "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor"); + "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor")); -- cgit