rpms/gnome-menus/devel gnome-menus.spec,1.22,1.23

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10948

Modified Files:
	gnome-menus.spec 
Log Message:
- ship upstream .directory files



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-menus.spec	19 Jan 2006 20:08:31 -0000	1.22
+++ gnome-menus.spec	30 Jan 2006 19:10:17 -0000	1.23
@@ -7,13 +7,13 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.13.5
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:  redhat-menus >= 1.0
+Requires:  redhat-menus >= 5.5.5
 Requires: python-abi = %{pyver}
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: %{python}-devel >= 2.3.0
@@ -51,13 +51,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus
-rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories
 
 %find_lang %{po_package}
 
@@ -78,6 +78,7 @@
 %{_libdir}/python*/site-packages/GMenuSimpleEditor/*
 %{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
 %{_datadir}/applications/gmenu-simple-editor.desktop
+%{_datadir}/desktop-directories
 
 %files devel
 %defattr(-, root, root)
@@ -88,6 +89,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Fri Jan 27 2006 Ray Strode <rstrode at redhat.com> 2.13.5-3
+- ship upstream .directory files
+
 * Thu Jan 19 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-2
 - Add a BuildRequires for gamin