From ca12ddc0a9bee2a89c508c297ecb43f1e08b7e51 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 22 Feb 2012 00:22:08 +0000 Subject: [PATCH] Drop the rpath change as it's fixed upstream and the associated circular dep hack --- gnome-menus.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnome-menus.spec b/gnome-menus.spec index 19dcc33..970ee4a 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -3,10 +3,11 @@ Summary: A menu system for the GNOME project Name: gnome-menus Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org/ + #VCS: git:git://git.gnome.org/gnome-menus Source0: http://download.gnome.org/sources/gnome-menus/3.3/%{name}-%{version}.tar.xz # Keep release notes from showing up in Applications>Other @@ -20,8 +21,6 @@ BuildRequires: pkgconfig BuildRequires: python2-devel BuildRequires: intltool BuildRequires: gobject-introspection-devel -# FIXME: temporary hack for introspection breakage -BuildRequires: gnome-menus-devel %description gnome-menus is an implementation of the draft "Desktop @@ -52,10 +51,6 @@ writing applications that use the GNOME menu system. --enable-debug=no %endif -## 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} @@ -97,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/ %{_datadir}/gir-1.0/GMenu-3.0.gir %changelog +* Tue Feb 21 2012 Peter Robinson - 3.3.5-2 +- Drop the rpath change as it's fixed upstream and the associated circular dep hack + * Tue Feb 7 2012 Matthias Clasen - 3.3.5-1 - Update to 3.3.5