From 97dec272b4a3327b1e7eb34c704b5ee35247bced Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Fri, 19 Dec 2008 11:52:45 +0000 Subject: [PATCH] use chrpath instead of modifying libtool, was breaking `make check' --- import.log | 1 + xcb-util.spec | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/import.log b/import.log index 8d7a732..10d93fe 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ xcb-util-0_3_1-2_fc10:HEAD:xcb-util-0.3.1-2.fc10.src.rpm:1228863002 xcb-util-0_3_2-1_fc10:HEAD:xcb-util-0.3.2-1.fc10.src.rpm:1229633234 +xcb-util-0_3_2-2_fc10:HEAD:xcb-util-0.3.2-2.fc10.src.rpm:1229687450 diff --git a/xcb-util.spec b/xcb-util.spec index 7ce7ce6..b6cde68 100644 --- a/xcb-util.spec +++ b/xcb-util.spec @@ -1,6 +1,6 @@ Name: xcb-util Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convenience libraries sitting on top of libxcb Group: System Environment/Libraries @@ -11,6 +11,7 @@ Patch0: xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch Patch1: xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel +BuildRequires: chrpath %description @@ -40,17 +41,12 @@ Development files for xcb-util. %build %configure --with-pic --disable-static -# get rid of rpath - Freedesktop.org bug 19156, https://bugs.freedesktop.org/show_bug.cgi?id=19156 -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} -# fix make check, Freedesktop.org bug 19157 -#%check +%check -#make check +make check %install @@ -58,6 +54,9 @@ rm -rf %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +# remove RPATH +chrpath --delete $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-icccm.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-property.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-wm.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-image.so.0.0.0 + rm %{buildroot}%{_libdir}/*.la @@ -86,6 +85,10 @@ rm -rf %{buildroot} %changelog +* Fri Dec 19 2008 Michal Nowak - 0.3.2-2 +- hack the sed lines after %%configure out and hack chrpath in +- make check is running again + * Thu Dec 18 2008 Michal Nowak - 0.3.2-1 - 0.3.2 - remove rpath (x86-64)