2.26.1

6 files changed, 8 insertions, 55 deletions

diff --git a/.cvsignore b/.cvsignore
index fe50772..7be9bc8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.92.tar.bz2
+gnome-applets-2.26.1.tar.bz2
diff --git a/cpufreq-error-registration-error.patch b/cpufreq-error-registration-error.patch
deleted file mode 100644
index df3a1f1..0000000
--- a/cpufreq-error-registration-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.error-registration-error gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
---- gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.error-registration-error	2009-03-29 13:47:24.766889841 -0400
-+++ gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c	2009-03-29 13:46:19.376910898 -0400
-@@ -54,7 +54,7 @@ cpufreq_selector_service_error_get_type 
- 	static GType etype = 0;
- 
- 	if (G_UNLIKELY (etype == 0)) {
--		const GEnumValue values[] = {
-+		static const GEnumValue values[] = {
- 			{ SERVICE_ERROR_GENERAL,            "SERVICE_ERROR_GENERAL",            "GeneralError" },
- 			{ SERVICE_ERROR_DBUS,               "SERVICE_ERROR_DBUS",               "DBUSError" },
- 			{ SERVICE_ERROR_ALREADY_REGISTERED, "SERVICE_ERROR_ALREADY_REGISTERED", "AlreadyRegistered" },
diff --git a/gnome-applets-invest-defs.patch b/gnome-applets-invest-defs.patch
deleted file mode 100644
index e1ab143..0000000
--- a/gnome-applets-invest-defs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-applets-2.25.92/invest-applet/invest/Makefile.am.invest gnome-applets-2.25.92/invest-applet/invest/Makefile.am
---- gnome-applets-2.25.92/invest-applet/invest/Makefile.am.invest	2009-03-21 23:03:10.442647987 -0400
-+++ gnome-applets-2.25.92/invest-applet/invest/Makefile.am	2009-03-21 23:03:33.497690275 -0400
-@@ -14,6 +14,9 @@ invest_PYTHON = \
- 	widgets.py \
- 	quotes.py \
- 	preferences.py
-+
-+nodist_invest_PYTHON = \
-+	defs.py
- 	
- BUILT_SOURCES = \
- 	invest-applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index afa921b..0f1a8a5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.92
-Release: 	4%{?dist}
+Version:	2.26.1
+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.25/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,15 +61,6 @@ Patch40:	gnome-applets-null-battstat.patch
 # and keep the mixer hidden away from the add to panel dialog
 Patch41:	gnome-applets-no-mixer-icon.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=575782
-Patch42:	mini-commander-https.patch
-
-# fixed upstream
-Patch43:	gnome-applets-invest-defs.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=577212
-Patch44:	cpufreq-error-registration-error.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -153,9 +144,6 @@ and more.
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .minicommander-https
-%patch43 -p1 -b .invest-defs
-%patch44 -p1 -b .error-registration-error
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -350,6 +338,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+
 * Sun Mar 29 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.25.92-4
 - Make cpufreq applet work (#492741)
 
diff --git a/mini-commander-https.patch b/mini-commander-https.patch
deleted file mode 100644
index 117a9aa..0000000
--- a/mini-commander-https.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h.https gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h
---- gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h.https	2009-03-17 21:53:14.032776258 -0400
-+++ gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h	2009-03-17 21:54:05.907524832 -0400
-@@ -39,7 +39,7 @@ typedef struct {
-  * installed into the schemas.
-  */
- static const MCDefaultMacro mc_default_macros [] = {
--	{ "^(http://.*)$",       "gnome-open \\1" },
-+	{ "^(https?://.*)$",       "gnome-open \\1" },
- 	{ "^(ftp://.*)",         "gnome-open \\1" },
- 	{ "^(www\\..*)$",        "gnome-open http://\\1" },
- 	{ "^(ftp\\..*)$",        "gnome-open ftp://\\1" },
-diff -up gnome-applets-2.25.92/mini-commander/src/mc-install-default-macros.c.https gnome-applets-2.25.92/mini-commander/src/mc-install-default-macros.c
diff --git a/sources b/sources
index f6f01f0..ea4dc2a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6c19de60f92fa619892f16dae8ebf238  gnome-applets-2.25.92.tar.bz2
+ef6c44bba892d28b46cf19fcb2e71d61  gnome-applets-2.26.1.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2