2.15.1.1

4 files changed, 57 insertions, 13 deletions

diff --git a/.cvsignore b/.cvsignore
index 6f9e02c..d197c20 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ gnome-applets-2.9.3.1-modemlights.tar.bz2
 gnome-applets-2.14.0.tar.bz2
 gnome-applets-2.14.1.tar.bz2
 gnome-applets-2.14.2.tar.bz2
+gnome-applets-2.15.1.1.tar.bz2
diff --git a/gnome-applets-2.15.1.1-cpufreq.patch b/gnome-applets-2.15.1.1-cpufreq.patch
new file mode 100644
index 0000000..1b83f5c
--- /dev/null
+++ b/gnome-applets-2.15.1.1-cpufreq.patch
@@ -0,0 +1,34 @@
+--- gnome-applets-2.15.1.1/cpufreq/src/cpufreq-utils.c.cpufreq	2006-06-19 08:40:36.000000000 -0400
++++ gnome-applets-2.15.1.1/cpufreq/src/cpufreq-utils.c	2006-06-19 08:40:47.000000000 -0400
+@@ -105,6 +105,8 @@
+ 	if (!path)
+ 		return FALSE;
+ 
++	return TRUE;
++
+ 	if (geteuid () == 0)
+ 		return TRUE;
+ 
+--- gnome-applets-2.15.1.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-06-15 01:01:54.000000000 -0400
++++ gnome-applets-2.15.1.1/cpufreq/src/cpufreq-popup.c	2006-06-19 08:43:05.000000000 -0400
+@@ -246,19 +246,13 @@
+ cpufreq_popup_run_selector (CPUFreqPopup *popup,
+ 			    const gchar  *params)
+ {
+-	gchar  *path;
+ 	guint   cpu;
+ 	gchar  *command;
+ 	GError *error = NULL;
+ 
+-	path = g_find_program_in_path ("cpufreq-selector");
+-
+-	if (!path)
+-		return;
+-
+ 	cpu = cpufreq_prefs_get_cpu (popup->priv->prefs);
+ 
+-	command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
++	command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
+ 
+ 	g_spawn_command_line_async (command, &error);
+ 	g_free (command);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9da9111..9a75da8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,8 +1,11 @@
-%define glib2_version 2.2.0
+%define glib2_version 2.6.0
 %define pango_version 1.2.0
 %define gtk2_version 2.6.0
-%define libgnomeui_version 2.3.0
-%define gnome_panel_version 2.5.91
+%define libgnome_version 2.8.0
+%define libgnomeui_version 2.8.0
+%define gnome_vfs_version 2.8.0
+%define libglade_version 2.4.0
+%define gnome_panel_version 2.13.4
 %define libgtop2_version 2.12.0
 %define gail_version 1.2.0
 %define libbonoboui_version 2.3.0
@@ -10,29 +13,29 @@
 %define gstreamer_version 0.10
 %define libxklavier_version 2.91
 %define libwnck_version 2.9.3
-%define libgnome_desktop_version 2.10.2
+%define libgnome_desktop_version 2.11.1
 %define gnome_utils_version 2.8.1
 %define dbus_version 0.60
 %define hal_version 0.5.3
 %define libnotify_version 0.3.2
+%define pygobject_version 2.6
+%define gnome_python_version 2.10
 
 %define po_package gnome-applets-2.0
 
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
-Version: 	2.14.2
-Release:  	5
+Version: 	2.15.1.1
+Release:  	1
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
 Source1:	gnome-applets-2.9.3.1-modemlights.tar.bz2
-Patch0:		gnome-applets-2.10.1-use-old-modemlights.patch
+Patch0:		gnome-applets-2.15.1.1-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
-Patch4:		gnome-applets-2.14.2-cpufreq.patch
-Patch5:	        gnome-applets-2.13.4-warning.patch
-Patch6:	        gnome-applets-2.13.90-stock-ticker.patch
+Patch4:		gnome-applets-2.15.1.1-cpufreq.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
 
 URL:		http://www.gnome.org/
@@ -44,7 +47,10 @@ Prereq:         gtk2 >= %{gtk2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires:  libgnome-devel >= %{libgnome_version}
+BuildRequires:  gnome-vfs2-devel >= %{gnome_vfs_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
+BuildRequires:  libglade2-devel >= %{libglade_version}
 BuildRequires:  libgtop2-devel >= %{libgtop2_version}
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gail-devel >= %{gail_version}
@@ -59,6 +65,8 @@ BuildRequires:  gnome-desktop-devel >= %{libgnome_desktop_version}
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
 BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
+BuildRequires:  pygobject-devel >= %{pygobject_version}
+BuildRequires:  gnome-python2-devel >= %{gnome_python_version}
 
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  xorg-x11-proto-devel
@@ -95,8 +103,6 @@ small utilities for the GNOME panel.
 %patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
-%patch5 -p1 -b .warning
-%patch6 -p1 -b .stock-ticker
 %patch9 -p1 -b .gswitchit-export-dynamic
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
@@ -223,6 +229,9 @@ fi
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Mon Jun 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.1.1-1
+- Update to 2.15.1.1
+
 * Thu Jun 15 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-5
 - Rebuild against new libxklavier
 
diff --git a/sources b/sources
index e2f8d2a..859f449 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-e6da539e78da1256b9a9bee1301fd44f  gnome-applets-2.14.2.tar.bz2
+d632538ac5a4ed880302be25dbdc0f69  gnome-applets-2.15.1.1.tar.bz2