X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=STLport.spec;h=2e193f706e70e9eba94967da2fb79066faad92d2;hb=e7aa16c9bbb4ac910de0a7c7b488264042f43cc1;hp=631a538f8f91133b94a09f4051bd749f0d4981fd;hpb=c3d792e6149a772c5c962b2ac079c24afb5ea8cc;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index 631a538..2e193f7 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,16 +1,15 @@
-# TODO:
-#	doesn't build with libstdc++-4.2.0
 Summary:	C++ standard library
-Summary(pl):	Biblioteki standardowe C++
+Summary(pl.UTF-8):	Biblioteki standardowe C++
 Name:		STLport
-Version:	5.1.0
-Release:	0.1
+Version:	5.1.3
+Release:	1
 Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5:	dcf079313e7e0d7870307b74b658bb81
+# Source0-md5:	3dcdc33b9bd8295a46f3f08557591ea4
 Patch0:		%{name}-endianness.patch
+Patch1:		%{name}-gcc420_dirty_hack.patch
 URL:		http://stlport.sourceforge.net/
 BuildRequires:	libstdc++-devel >= 5:3.3.2
 BuildRequires:	sed >= 4.0
@@ -21,38 +20,39 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 STLport is a multiplatform implementation of C++ Standard Template
 Library based on SGI STL. It's used by e.g. OpenOffice.
 
-%description -l pl
+%description -l pl.UTF-8
 STLport to wieloplatformowa implementacja standardowej biblioteki
-szablonów (Standard Template Library) C++ oparta na SGI STL. Jest
-u¿ywana m.in. przez OpenOffice.
+szablonów (Standard Template Library) C++ oparta na SGI STL. Jest
+używana m.in. przez OpenOffice.
 
 %package devel
 Summary:	STLport heades files, documentation
-Summary(pl):	Pliki nag³ówkowe i dokumentacja do STLport
+Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do STLport
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files and development documentation for STLport.
 
-%description devel -l pl
-Pliki nag³ówkowe i dokumentacja dla STLport.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i dokumentacja dla STLport.
 
 %package static
 Summary:	Static STLport libraries
-Summary(pl):	Biblioteki statyczne do STLport
+Summary(pl.UTF-8):	Biblioteki statyczne do STLport
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static STLport libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Biblioteki statyczne do STLport.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
@@ -76,6 +76,10 @@ install -d $RPM_BUILD_ROOT%{_includedir}
 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.*.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libstlport.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -85,14 +89,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_libdir}/*.so.*
+%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.?
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{FAQ,*.txt}
+%attr(755,root,root) %{_libdir}/libstlport.so
 %{_includedir}/stlport
-%attr(755,root,root) %{_libdir}/*.so
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libstlport.a