2.17.90gnome-applets-2_17_90-1_fc7

3 files changed, 14 insertions, 35 deletions

diff --git a/.cvsignore b/.cvsignore
index 5b20d80..7d05b79 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,4 @@ gnome-applets-2.16.0.1.tar.bz2
 gnome-applets-2.16.1.tar.bz2
 gnome-applets-2.16.2.tar.bz2
 gnome-applets-2.17.1.tar.bz2
+gnome-applets-2.17.90.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index add410e..94727a3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,7 +3,7 @@
 %define gtk2_version 2.6.0
 %define libgnome_version 2.8.0
 %define libgnomeui_version 2.8.0
-%define gnome_vfs_version 2.8.0
+%define gnome_vfs_version 2.15.4
 %define libglade_version 2.4.0
 %define gnome_panel_version 2.13.4
 %define libgtop2_version 2.12.0
@@ -32,7 +32,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.17.1
+Version:	2.17.90
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPL
@@ -49,24 +49,10 @@ Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.17.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=352777
-#Patch16: keyboard-drawing-rotated-text.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352778
-#Patch17: keyboard-drawing-label-color.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352779
-#Patch18: keyboard-drawing-primary.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352781
-#Patch19: keyboard-drawing-corner.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=353163
-#Patch20: keyboard-drawing-redraw.patch
-
-Patch27: gnome-applets-2.16.1-desktop-files.patch
-
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
-Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
+Patch27:	gnome-applets-2.16.1-desktop-files.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=395035
-Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
+Patch30:	gnome-applets-2.16.0.1-fix-null-applet.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -102,7 +88,7 @@ BuildRequires:  which
 BuildRequires:  libtool autoconf gettext
 BuildRequires:  pkgconfig
 BuildRequires:  gnome-icon-theme 
-BuildRequires:  perl-XML-Parser
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  libgnomekbd-devel
 
 Requires:	gnome-panel >= %{gnome_panel_version}
@@ -111,14 +97,10 @@ Requires:	gstreamer-plugins-base >= %{gstreamer_plugins_version}
 Requires:	gstreamer-plugins-good >= %{gstreamer_plugins_version}
 
 Requires(pre): GConf2 >= %{gconf_version}
-Requires(pre): GConf2 >= %{gconf_version}
-
 Requires(preun): GConf2 >= %{gconf_version}
-
-Requires(post): scrollkeeper >= 0.1.4
 Requires(post): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
 
+Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
 # For wireless-applet backwards compat
@@ -130,14 +112,14 @@ Source10:	cpufreq-selector.app
 Source11:	cpufreq-selector.pam
 
 # For invest-applet
-Requires: gnome-python2-applet
-Requires: gnome-python2-libegg
+Requires:	gnome-python2-applet
+Requires:	gnome-python2-libegg
 
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
 
 # since we are installing .pc files
-Requires: pkgconfig
+Requires:	pkgconfig
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -152,15 +134,8 @@ small utilities for the GNOME panel.
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
 
-#%patch16 -p1 -b .rotated-text
-#%patch17 -p1 -b .label-color
-#%patch18 -p1 -b .primary
-#%patch19 -p1 -b .corner
-#%patch20 -p1 -b .redraw
-
 %patch27 -p1 -b .desktop-files
 
-%patch29 -p1 -b .delay-gstreamer-initialization
 %patch30 -p1 -b .fix-null-applet
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
@@ -345,6 +320,9 @@ fi
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Feb 27 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.17.90-1
+- Update to 2.17.90
+
 * Wed Jan 10 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.17.1-1
 - Update to 2.17.1
 
diff --git a/sources b/sources
index 3810962..69a5ed4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-bd7395e3a0e1a21af79c2c7e3ba60f40  gnome-applets-2.17.1.tar.bz2
+350d527d2f5391385402f28ad96a99c5  gnome-applets-2.17.90.tar.bz2