From 5636cb3c024b7dc645cbc9d3e7020e7fa7e74046 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jan 22 2007 04:08:33 +0000
Subject: 2.17.90


---

diff --git a/.cvsignore b/.cvsignore
index 2042aa1..62221f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-desktop-2.17.5.tar.bz2
+gnome-desktop-2.17.90.tar.bz2
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 20caddc..0e0940e 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,23 +1,20 @@
-%define glib2_version 2.8.0
-%define pango_version 1.2.0
+%define libxml2_version 2.4.20
 %define gtk2_version 2.8.0
-%define gconf2_version 1.2.1
+%define glib2_version 2.8.0
 %define gnome_vfs2_version 2.2.0
 %define libgnomeui_version 2.2.0
-%define libgnome_version 2.2.0
+%define libgnomecanvas_version 2.0.0
 %define startup_notification_version 0.5
-%define po_package gnome-desktop-2.0
 %define gnome_doc_utils_version 0.3.2
 
+%define po_package gnome-desktop-2.0
+
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.17.5
+Version: 2.17.90
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.17/%{name}-%{version}.tar.bz2
-# FIXME: why are these needed ?
-Source2: gnome-money.png
-Source3: gnome-modem.png
 
 License: GPL 
 Group: System Environment/Libraries
@@ -28,26 +25,22 @@ Patch2:   gnome-desktop-2.9.91-desktop.patch
 
 Requires: redhat-artwork
 Requires: redhat-menus
-Requires: startup-notification >= 0.5
 
 Obsoletes: gnome-core gnome-core-devel
 Provides: gnome-core
 
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
+BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnome-devel >= %{libgnome_version}
+BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: scrollkeeper gettext
+BuildRequires: scrollkeeper 
+BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 
-PreReq: GConf2
-PreReq: /usr/bin/gconftool-2
-
 %description
 
 The gnome-desktop package contains an internal library
@@ -60,18 +53,19 @@ Summary: Libraries and headers for libgnome-desktop
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
 
-Requires: glib2-devel >= %{glib2_version}
+Requires: libxml2-devel >= %{libxml2_version}
 Requires: gtk2-devel >= %{gtk2_version}
-Requires: GConf2-devel >= %{gconf2_version}
+Requires: glib2-devel >= %{glib2_version}
 Requires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 Requires: libgnomeui-devel >= %{libgnomeui_version}
-Requires: libgnome-devel >= %{libgnome_version}
+Requires: libgnomecanvas-devel >= %{libgnomecanvas_version}
 Requires: startup-notification-devel >= %{startup_notification_version}
+Requires: gnome-doc-utils >= %{gnome_doc_utils_version}
 Requires: pkgconfig
 
 %description devel
 Libraries and header files for the GNOME-internal private library 
-libgnomedesktop
+libgnomedesktop.
 
 %prep
 %setup -q
@@ -79,9 +73,6 @@ libgnomedesktop
 %patch1 -p1 -b .kdetheme
 %patch2 -p1 -b .menu
 
-cp -f %{SOURCE2} pixmaps/
-cp -f %{SOURCE3} pixmaps/
-
 %build
 
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -132,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Sun Jan 21 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.90-1
+- Update to 2.17.90
+- Drop some long-obsolete images
+- Clean up BuildRequires
+
 * Wed Jan 10 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.5-1
 - Update to 2.17.5
 
diff --git a/sources b/sources
index e7c3e64..d4154ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5ae7812c8c824b1c2d9700bf2ce9994  gnome-desktop-2.17.5.tar.bz2
+16502fe04d2e1e959066afe9832efd05  gnome-desktop-2.17.90.tar.bz2