rpms/xcb-util/devel import.log,1.2,1.3 xcb-util.spec,1.2,1.3

[Michal Nowak]

Author: mnowak

Update of /cvs/pkgs/rpms/xcb-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22716/devel

Modified Files:
	import.log xcb-util.spec 
Log Message:
use chrpath instead of modifying libtool, was breaking `make check'



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Dec 2008 20:50:40 -0000	1.2
+++ import.log	19 Dec 2008 11:52:45 -0000	1.3
@@ -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


Index: xcb-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/xcb-util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcb-util.spec	18 Dec 2008 20:50:40 -0000	1.2
+++ xcb-util.spec	19 Dec 2008 11:52:45 -0000	1.3
@@ -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 @@
 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 @@
 %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 @@
 
 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 @@
 
 
 %changelog
+* Fri Dec 19 2008 Michal Nowak <mnowak at 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 at redhat.com> - 0.3.2-1
 - 0.3.2
 - remove rpath (x86-64)