Browse Source

cairo: remove hardcoded libdir/runpath

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7702 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
119184988f
1 changed files with 9 additions and 10 deletions
  1. 9 10
      c/cairo/cairo-vl.spec

+ 9 - 10
c/cairo/cairo-vl.spec

@@ -2,7 +2,7 @@ Summary:	Cairo - multi-platform 2D graphics library.
 Summary(ja):	Cairo - マルチプラットフォーム 2D グラフィックスライブラリ
 Name:		cairo
 Version:	1.12.14
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	LGPL/MPL
 Group:		System Environment/Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.xz
@@ -124,14 +124,10 @@ This package contains tools for working with the cairo graphics library.
 	   --enable-gobject \
 	   --enable-gl
 
-%ifarch x86_64
-cp libtool libtool.old
-ldpath="/lib64 /usr/lib64 /usr/lib /usr/X11R6/lib64 /usr/X11R6/lib"
-sed "s|^sys_lib_search_path_spec=.*|sys_lib_search_path_spec=$ldpath|" libtool.old \
-	> libtool
-rm libtool.old
-%endif
-make
+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}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -176,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat May 25 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.12.14-2
+- remove hardcoded libdir and runpath from libtool
+
 * Sun Feb 17 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.14-1
 - new upstream release 
 
@@ -199,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Mar 31 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.0-1
 - new upstream release
 
-* Tue Mar 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.10.2-2
+* Mon Mar 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.10.2-2
 - enable tee support
 - add configure options specifically
 - disable static library