Author: qboosh Date: Sat Nov 3 22:09:00 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - adapted alpha patch from AC-branch - dropped libstlport.so.5 symlink, soname is libstlport.so.5.1, so nothing should use the first
---- Files affected: SPECS: STLport.spec (1.86 -> 1.87) ---- Diffs: ================================================================ Index: SPECS/STLport.spec diff -u SPECS/STLport.spec:1.86 SPECS/STLport.spec:1.87 --- SPECS/STLport.spec:1.86 Thu Oct 18 13:41:06 2007 +++ SPECS/STLport.spec Sat Nov 3 23:08:54 2007 @@ -10,6 +10,7 @@ Source0: http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2 # Source0-md5: b8d1cba9fd823e1edbfd83b4bbcb237d Patch0: %{name}-endianness.patch +Patch1: %{name}-alpha.patch URL: http://stlport.sourceforge.net/ BuildRequires: libstdc++-devel >= 6:4.2.0-1 BuildRequires: sed >= 4.0 @@ -52,6 +53,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak @@ -75,8 +77,8 @@ cp -a stlport $RPM_BUILD_ROOT%{_includedir} rm -rf $RPM_BUILD_ROOT%{_includedir}/stlport/BC50 -# libstlport.so.5 is removed by ldconfig or *something*, so make .so point to real soname -ln -sf $(cd $RPM_BUILD_ROOT%{_libdir}; echo libstlport.so.*.*.*) \ +# let libstlport.so point to real lib, not artificial libstlport.so.5 symlink +ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlport.so.*.*.*) \ $RPM_BUILD_ROOT%{_libdir}/libstlport.so %clean @@ -88,10 +90,8 @@ %files %defattr(644,root,root,755) %doc README -%attr(755,root,root) %{_libdir}/libstlport.so.*.* -# libstlport.so points to this one instead of soname or real lib name -# to be fixed if nothing tries to dlopen this one (nothing should!) -%attr(755,root,root) %{_libdir}/libstlport.so.? +%attr(755,root,root) %{_libdir}/libstlport.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libstlport.so.?.? %files devel %defattr(644,root,root,755) @@ -109,6 +109,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.87 2007/11/03 22:08:54 qboosh +- adapted alpha patch from AC-branch +- dropped libstlport.so.5 symlink, soname is libstlport.so.5.1, so nothing + should use the first + Revision 1.86 2007/10/18 11:41:06 arekm - up to 5.1.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/STLport.spec?r1=1.86&r2=1.87&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
