update patchesgnome-panel-2_17_90-1_fc7

3 files changed, 34 insertions, 29 deletions

diff --git a/.cvsignore b/.cvsignore
index e0e70ab..4f7c5a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.16.2.tar.bz2
+gnome-panel-2.17.90.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f21bdbe..da2cf16 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,27 +1,28 @@
 %define gettext_package gnome-panel-2.0
 
-%define gtk2_version 2.7.1
+%define gnome_desktop_version 2.11.1
+%define gtk2_version 2.10.0
 %define libglade2_version 2.5.0
+%define libgnome_version 2.13.0
 %define libgnomeui_version 2.5.4
-%define gnome_desktop_version 2.9.91
-%define libwnck_version 2.9.92
-%define libbonobo_version 2.3.0
 %define libbonoboui_version 2.3.0
-%define gnome_vfs2_version 2.9.1
+%define orbit_version 2.4.0
+%define gnome_vfs2_version 2.14.2
+%define libwnck_version 2.13.5
+%define gconf_version 2.14
 %define gnome_menus_version 2.11.1
 %define evolution_data_server_version 1.9.1
-%define orbit_version 2.4.0
-%define gtk2_version 2.7.1
+%define cairo_version 1.0.0
 %define dbus_version 0.60
+%define dbus_glib_version 0.60
 %define gnome_doc_utils_version 0.3.2
-%define gconf_version 2.14
 
 %define use_evolution_data_server 1
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.16.2
-Release: 2%{?dist} 
+Version: 2.17.90
+Release: 1%{?dist} 
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -30,7 +31,7 @@ Source3: redhat-panel-backwards-compat-config.schemas
 Source4: add-translations.sh
 License: GPL 
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: libwnck >= %{libwnck_version}
@@ -39,10 +40,6 @@ Requires: gnome-menus >= %{gnome_menus_version}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
 
-Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm
-Prereq: GConf2 >= 2.6.0-2
-Prereq: scrollkeeper
-Prereq: gtk2 >= %{gtk2_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
 Requires(post): hicolor-icon-theme
@@ -50,7 +47,6 @@ Requires(pre): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
 Requires(postun): scrollkeeper
 
-BuildRequires: which
 BuildRequires: libxml2-python
 BuildRequires: intltool
 BuildRequires: gettext
@@ -61,36 +57,42 @@ BuildRequires: scrollkeeper
 BuildRequires: libxslt
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
+BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel >= %{libglade2_version}
+BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires: libwnck-devel >= %{libwnck_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
+BuildRequires: libwnck-devel >= %{libwnck_version}
+BuildRequires: GConf2-devel >= %{gconf_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
+BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: gtk-doc
+BuildRequires: pango-devel
+BuildRequires: libbonobo-devel
+BuildRequires: libXau-devel
 %if %{use_evolution_data_server}
 BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 
-Patch0: gnome-panel-2.12.1-vendor.patch
+Patch0: gnome-panel-2.17.90-vendor.patch
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch5: gnome-panel-2.12.1-about-fedora.patch
-Patch6: gnome-panel-2.13.5-switch-user.patch
+Patch5: gnome-panel-2.17.90-about-fedora.patch
 Patch8: gnome-panel-2.16.1-search.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=399270
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=399274
 Patch12: gnome-panel-2.14.2-xio-error.patch
-Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
-Patch14: gnome-panel-2.15.92-no-seconds.patch
+Patch13: gnome-panel-2.17.90-move-suspend-to-menu.patch
+Patch14: gnome-panel-2.17.90-no-seconds.patch
 Patch15: gnome-panel-2.16.0-compiz-support.patch
 # gnome bugzilla 365640
 Patch16: gnome-panel-2.16.0-fix-chinese.patch
-Patch18: gnome-panel-2.16.0-respect-session-properties.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -117,7 +119,6 @@ Panel Applets using the libpanel-applet library.
 %patch0 -p1 -b .vendor
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
 %patch5 -p1 -b .about-fedora
-%patch6 -p1 -b .switch-user
 %patch8 -p1 -b .search
 %patch9 -p1 -b .ignore-unknown-options
 %patch12 -p1 -b .xio-error
@@ -125,7 +126,6 @@ Panel Applets using the libpanel-applet library.
 %patch14 -p1 -b .no-seconds
 %patch15 -p0 -b .compiz-support
 %patch16 -p1 -b .fix-chinese
-%patch18 -p1 -b .respect-session-properties.patch
 
 . %{SOURCE4}
 
@@ -298,6 +298,11 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jan 22 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.90-1
+- Update to 2.17.90
+- Clean up BuildRequires
+- Allow user switching from the logout dialog
+
 * Sun Jan 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.16.2-2
 - Check for the right tracker desktop file
 
diff --git a/sources b/sources
index e59d53c..5828830 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82b98a9b2685cca2d381e185cae47596  gnome-panel-2.16.2.tar.bz2
+22f51578f9d70b4159246c04046152b0  gnome-panel-2.17.90.tar.bz2