From fe336229a049f092b79fab3e59b0ca5267ea2fdf Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 10 Jan 2007 19:14:07 +0000
Subject: [PATCH] 2.17.5

---
 .cvsignore       |  2 +-
 gnome-menus.spec | 22 ++++++++++++++--------
 sources          |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index baf83cd..0057352 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-menus-2.17.2.tar.bz2
+gnome-menus-2.17.5.tar.bz2
diff --git a/gnome-menus.spec b/gnome-menus.spec
index 9bb7602..c9d7168 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -5,13 +5,13 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.17.2
-Release: 2%{?dist}
+Version: 2.17.5
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 6.5.4
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: python2-devel >= 2.3.0
@@ -30,7 +30,7 @@ Python bindings, and a simple menu editor.
 %package devel
 Summary: Libraries and include files for the GNOME menu system
 Group: Development/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 Requires: glib2-devel >= 2.6.0
 Requires: python2-devel >= 2.3.0
 Requires: gamin-devel
@@ -67,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories/Desktop.directory
 
 # We use alacarte now
 rm -rf $RPM_BUILD_ROOT%{_bindir}/gmenu-simple-editor
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/gmenu-simple-editor.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/GMenuSimpleEditor/*
+
+# No point in shipping this either
+%{_bindir}/gnome-menu-spec-test
 
 %find_lang %{po_package}
 
@@ -83,9 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc
 %{_libdir}/libgnome-menu.so.*
 %{python_sitearch}/gmenu.so
-%{python_sitearch}/GMenuSimpleEditor/*
-%{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
-%{_datadir}/applications/gmenu-simple-editor.desktop
 %{_datadir}/desktop-directories
 
 %files devel
@@ -93,9 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/gnome-menus
-%{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Wed Jan 10 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.5-1
+- Update to 2.17.5 
+- Remove traces of gmenu-simple-editor
+
 * Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 2.17.2-2
 - rebuild for python 2.5
 
diff --git a/sources b/sources
index 9f3f339..adef9bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4eddca0b934723e41e81df11c69215f7  gnome-menus-2.17.2.tar.bz2
+55ddcab03c788c8bc28fcadc81ae61e8  gnome-menus-2.17.5.tar.bz2