rpms/libfm/devel libfm.spec,1.7,1.8

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/libfm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3951/devel

Modified Files:
	libfm.spec 
Log Message:
* Fri May  7 2010 Mamrou Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-3
- Remove runpath_var=... trick on libtool which causes internal
  linkage error,
  and treak sys_lib_dlsearch_path_spec instead for rpath issue on x86_64



Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libfm.spec	7 May 2010 08:21:35 -0000	1.7
+++ libfm.spec	7 May 2010 09:11:11 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           libfm
 Version:        0.1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -21,9 +21,7 @@ BuildRequires:  menu-cache-devel >= 0.3.
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-# For Patch1
-BuildRequires:  automake
-BuildRequires:  libtool
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -81,15 +79,13 @@ developing applications that use %{name}
 %patch0 -p1 -b .orig
 %patch2 -p1 -b .gterm_segv
 
-# Patch1 needs autotools
-%patch1 -p1 -b .link -R
-autoreconf -fi
+# treak rpath
+sed -i.libdir_syssearch -e \
+  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
+  configure
 
 %build
 %configure --disable-static
-# remove rpaths
-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}
 
 
@@ -124,6 +120,7 @@ do
   done
 done
 
+/usr/lib/rpm/check-rpaths
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -185,6 +182,11 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Fri May  7 2010 Mamrou Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-3
+- Remove runpath_var=... trick on libtool which causes internal
+  linkage error,
+  and treak sys_lib_dlsearch_path_spec instead for rpath issue on x86_64
+
 * Fri May  7 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-2
 - Fix wrapper of gnome-terminal when libfm.conf doesn't exist or so
   (bug 589730)