From 2623016c9990499315ca1e0a8ae8240514655e59 Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Thu, 23 Sep 2010 15:57:25 +0530
Subject: [PATCH] - Merge-review cleanup (#225823)

---
 gnome-menus.spec | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/gnome-menus.spec b/gnome-menus.spec
index b74220e..128eefa 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -1,12 +1,9 @@
-%define po_package gnome-menus
-%define enable_debugging 0
-
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global enable_debugging 0
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.30.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -14,13 +11,13 @@ URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-menus/2.30/%{name}-%{version}.tar.bz2
 # Keep release notes from showing up in Applications>Other
 Patch0: other-docs.patch
-Requires:  redhat-menus >= 7.8.9-2
+Requires:  redhat-menus 
 BuildRequires: gamin-devel
 BuildRequires: gawk
 BuildRequires: gettext
-BuildRequires: glib2-devel >= 2.15.2
+BuildRequires: glib2-devel
 BuildRequires: pkgconfig
-BuildRequires: python2-devel >= 2.3.0
+BuildRequires: python2-devel 
 BuildRequires: intltool
 
 %description
@@ -34,10 +31,6 @@ Python bindings, and a simple menu editor.
 Summary: Libraries and include files for the GNOME menu system
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 2.15.2
-Requires: python2-devel >= 2.3.0
-Requires: gamin-devel
-Requires: pkgconfig
 
 %description devel
 This package provides the necessary development libraries for
@@ -48,24 +41,24 @@ writing applications that use the GNOME menu system.
 %patch0 -p1 -b .other-docs
 
 %build
-%configure \
+%configure --disable-static \
 %if %{enable_debugging}
    --enable-debug=yes
 %else
    --enable-debug=no
 %endif
 
-make
+## Fix rpath in gmenu.so
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-make install DESTDIR=$RPM_BUILD_ROOT
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-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/Desktop.directory
 
@@ -79,16 +72,13 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/GMenuSimpleEditor/*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/gnome-menu-spec-test
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/
 
-%find_lang %{po_package}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %{name}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%files -f %{po_package}.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS COPYING.LIB
 %{_libdir}/libgnome-menu.so.*
@@ -96,12 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/desktop-directories/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/gnome-menus
 
 %changelog
+* Fri Sep 10 2010 Parag Nemade <paragn AT fedoraproject.org> 2.30.0-4
+- Merge-review cleanup (#225823)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.30.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild