X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=STLport.spec;h=bedd9ee7276393aac6e805b0bb88ce5b2ba7f25a;hb=d5885b1de5bdb6ad4edbc9fa8bc4b5495a387dae;hp=3fa87483e6a0087adccf1ab28301d461c6ea3d01;hpb=db37a5a58a190a4ff9130ae1a237bcfc65dfaeb9;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index 3fa8748..bedd9ee 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,35 +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:	5
+Version:	5.1.0
+Release:	1
+Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
-Source0:	http://www.stlport.com/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	cd4dd34b623a8704fbc800de79705171
-Patch0:		%{name}-nodebug.patch
-Patch1:		%{name}-gcc3.patch
-Patch2:		%{name}-4.5.3-gcc3stdexcept.patch
-#Patch3:		%{name}-4.5.3-nobadlink.patch
-Patch4:		%{name}-4.5.3-extra-cxxflags.patch
-URL:		http://www.stlport.org/
-BuildRequires:	gcc-c++
-# rationale: the -gcc3.patch
+Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
+# Source0-md5:	dcf079313e7e0d7870307b74b658bb81
+Patch0:		%{name}-endianness.patch
+Patch1:		%{name}-type_promotion.patch
+Patch2:		%{name}-gcc420_dirty_hack.patch
+Patch3:		%{name}-gcc420.patch
+URL:		http://stlport.sourceforge.net/
+BuildRequires:	libstdc++-devel >= 5:3.3.2
+BuildRequires:	sed >= 4.0
 %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.
@@ -41,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.
@@ -52,43 +54,53 @@ Biblioteki statyczne do STLport.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# UPDATE or DROP (needed?)
+#%patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-%patch4 -p1
+%patch3 -p1
+
+sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %build
-cd src
-CXXFLAGS="%{rpmcflags}" \
-%{__make} -f gcc.mak
+%{__make} -C build/lib -f gcc.mak \
+	release-shared \
+	release-static \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
+install -d $RPM_BUILD_ROOT%{_includedir}
+
+%{__make} -C build/lib -f gcc.mak \
+	install-release-shared \
+	install-release-static \
+	INSTALL_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+	INSTALL_LIB_DIR=$RPM_BUILD_ROOT%{_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
+cp -a stlport $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_includedir}/stlport/BC50
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*.*
-%attr(755,root,root) %{_libdir}/*.so
+%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.?
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/* README
+%doc doc/{FAQ,*.txt}
+%attr(755,root,root) %{_libdir}/libstlport.so
 %{_includedir}/stlport
-#%%{_libdir}/*.so
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libstlport.a