rpms/OpenIPMI/F-10 OpenIPMI.spec,1.60,1.61

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/OpenIPMI/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24984

Modified Files:
	OpenIPMI.spec 
Log Message:
fix linking without rpath, prelink won't screw up the libraries anymore
Resolves: #475265


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/F-10/OpenIPMI.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- OpenIPMI.spec	10 Dec 2008 14:21:43 -0000	1.60
+++ OpenIPMI.spec	11 Dec 2008 11:14:39 -0000	1.61
@@ -14,7 +14,7 @@
 Source3: openipmigui.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
-BuildRequires: openssl-devel python-devel perl-devel chrpath tcl-devel tkinter
+BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter
 BuildRequires: desktop-file-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -73,20 +73,21 @@
 %build
 export CFLAGS=-fPIC
 %configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --disable-static
-sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
-make # not %{?_smp_mflags} safe
+# get rid of rpath
+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   # not %{?_smp_mflags} safe
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # Remove python cruft in 32bit libdir on 64bit archs...
 %ifarch ppc64 s390x x86_64
 rm -rf $RPM_BUILD_ROOT/usr/lib
 %endif
-# Remove rpaths from libOpenIPMIposix.so.0.0.1
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libOpenIPMIposix.so.0.0.1
-# Remove static libraries
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
@@ -167,6 +168,8 @@
 * Wed Dec 10 2008 Jan Safranek <jsafrane at redhat.com> - 2.0.14-7
 - shorter probe interval is used in init script, making the service startup
   quicker in most situations (#475101)
+- fix linking without rpath, prelink won't screw up the libraries 
+  anymore (#475265)
 
 * Thu Oct 30 2008 Jan Safranek <jsafrane at redhat.com> - 2.0.14-6
 - removed static libraries from the -devel subpackage