rpms/xcb-util
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use chrpath instead of modifying libtool, was breaking `make check'

Browse Source
This commit is contained in:
Michal Nowak 2008-12-19 11:52:45 +00:00
parent 5f26c36c1f
commit 97dec272b4
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
import.log
View File

@ -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_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-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

19
xcb-util.spec
View File

@ -1,6 +1,6 @@
Name: xcb-util Name: xcb-util
Version: 0.3.2 Version: 0.3.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: Convenience libraries sitting on top of libxcb Summary: Convenience libraries sitting on top of libxcb
Group: System Environment/Libraries 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 Patch1: xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel BuildRequires: gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel
BuildRequires: chrpath
%description %description
@ -40,17 +41,12 @@ Development files for xcb-util.
%build %build
%configure --with-pic --disable-static %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} make %{?_smp_mflags}
# fix make check, Freedesktop.org bug 19157 %check
#%check
#make check make check
%install %install
@ -58,6 +54,9 @@ rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" 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 rm %{buildroot}%{_libdir}/*.la
@ -86,6 +85,10 @@ rm -rf %{buildroot}
%changelog %changelog
* Fri Dec 19 2008 Michal Nowak <mnowak@redhat.com> - 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 <mnowak@redhat.com> - 0.3.2-1 * Thu Dec 18 2008 Michal Nowak <mnowak@redhat.com> - 0.3.2-1
- 0.3.2 - 0.3.2
- remove rpath (x86-64) - remove rpath (x86-64)