X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=STLport.spec;h=d9cf681f033df59238ad71a03d79e86bcde72db4;hb=3e10d7c4ee91b4a93f09c0a24d05468d36ae4ad6;hp=d24c6b0ca2f487a6fae578bebbcf8717f9d77549;hpb=053bebbbb425495eca3bf38bf9af22160b8a5554;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index d24c6b0..d9cf681 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,36 +1,37 @@
-# TODO: add SONAME to libstlport_gcc.so*
 Summary:	C++ standard library
 Summary(pl):	Biblioteki standardowe C++
 Name:		STLport
-Version:	4.5.3
-Release:	6
+Version:	4.6.2
+Release:	3
+Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://www.stlport.com/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	cd4dd34b623a8704fbc800de79705171
+# Source0-md5:	4c01c84f1212369ceb369567ed06d1a2
 Patch0:		%{name}-nodebug.patch
-Patch1:		%{name}-gcc3.patch
-Patch2:		%{name}-4.5.3-gcc3stdexcept.patch
-#Patch3:		%{name}-4.5.3-nobadlink.patch
+Patch1:		%{name}-soname.patch
+Patch2:		%{name}-gcc34.patch
+Patch3:		%{name}-4.5.3-gcc3stdexcept.patch
 Patch4:		%{name}-4.5.3-extra-cxxflags.patch
-Patch5:		%{name}-soname.patch
 URL:		http://www.stlport.org/
-BuildRequires:	gcc-c++
-# rationale: the -gcc3.patch
+BuildRequires:	libstdc++-devel >= 5:3.3.2
 %requires_eq	libstdc++
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Implementation of C++ standard library required by OpenOffice.
+STLport is a multiplatform implementation of C++ Standard Template
+Library based on SGI STL. It's used by e.g. OpenOffice.
 
 %description -l pl
-Implementacja standardowej biblioteki C++ wymaganej przez OpenOffice.
+STLport to wieloplatformowa implementacja standardowej biblioteki
+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
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files and development documentation for STLport.
@@ -42,7 +43,7 @@ Pliki nag
 Summary:	Static STLport libraries
 Summary(pl):	Biblioteki statyczne do STLport
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static STLport libraries.
@@ -55,41 +56,37 @@ Biblioteki statyczne do STLport.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
-cd src
-CXXFLAGS="%{rpmcflags}" \
-%{__make} -f gcc.mak
+%{__make} -C src -f gcc.mak \
+	CXXFLAGS="%{rpmcxxflags}" \
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
 
-rm -fr stlport/{BC50,old_hp}
-cp -fr stlport $RPM_BUILD_ROOT%{_includedir}
-install lib/*.a $RPM_BUILD_ROOT%{_libdir}
-install lib/*.so.* $RPM_BUILD_ROOT%{_libdir}
-ln -sf libstlport_gcc.so.4.5 $RPM_BUILD_ROOT%{_libdir}/libstlport_gcc.so
+%{__make} -C src -f gcc.mak install \
+	INSTALLDIR=$RPM_BUILD_ROOT%{_prefix} \
+	INSTALLDIR_LIB=$RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
+%doc README
 %attr(755,root,root) %{_libdir}/*.so.*.*
 %attr(755,root,root) %{_libdir}/*.so
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/* README
+%doc doc/{images,README.gcc.html,[a-z]*.html}
 %{_includedir}/stlport
-#%%{_libdir}/*.so
 
 %files static
 %defattr(644,root,root,755)