X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=STLport.spec;h=874b35633c40d98694aace55d93c50e90e71ea4e;hb=b5fc9b80b046d25a2c4c82426e59c04f2a058a9e;hp=7ce22de88f9766214d78c3c076c8ea0c4b818856;hpb=1555187b23d87be9dc817688eb97651d3c10a504;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index 7ce22de..874b356 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,17 +1,23 @@
+#
+# Conditional build:
+%bcond_with	static_gcc	# linkg libgcc* statically into libstlport.
+#
 Summary:	C++ standard library
-Summary(pl):	Biblioteki standardowe C++
+Summary(pl.UTF-8):	Biblioteki standardowe C++
 Name:		STLport
-Version:	5.0.2
-Release:	3
+Version:	5.1.5
+Release:	2
 Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5:	784be5e0499009aeea6e9ec8f7259c41
+# Source0-md5:	e31d0dc9141c4f264d887754b559cc84
 Patch0:		%{name}-endianness.patch
-Patch1:		%{name}-type_promotion.patch
+Patch1:		%{name}-alpha.patch
+Patch2:		%{name}-valarray-copy-constructor.patch
+Patch3:		%{name}-vendor_gcc_detection.patch
 URL:		http://stlport.sourceforge.net/
-BuildRequires:	libstdc++-devel >= 5:3.3.2
+BuildRequires:	libstdc++-devel >= 6:4.2.0-1
 BuildRequires:	sed >= 4.0
 %requires_eq	libstdc++
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -20,79 +26,152 @@ 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.
 
+%package dbg
+Summary:	Debug version of STLport library
+Summary(pl.UTF-8):	Wersja diagnostyczna biblioteki STLport
+Group:		Libraries
+%requires_eq	libstdc++
+
+%description dbg
+Debug version of STLport library.
+
+%description dbg -l pl.UTF-8
+Wersja diagnostyczna biblioteki STLport.
+
+%package dbg-devel
+Summary:	Debug version of STLport library - development files
+Summary(pl.UTF-8):	Wersja diagnostyczna biblioteki STLport - pliki programistyczne
+Group:		Development/Libraries
+Requires:	%{name}-dbg = %{epoch}:%{version}-%{release}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+
+%description dbg-devel
+Debug version of STLport library - development files.
+
+%description dbg-devel -l pl.UTF-8
+Wersja diagnostyczna biblioteki STLport - pliki programistyczne.
+
+%package dbg-static
+Summary:	Static debug version of STLport library
+Summary(pl.UTF-8):	Statyczna wersja diagnostyczna biblioteki STLport
+Group:		Development/Libraries
+Requires:	%{name}-dbg-devel = %{epoch}:%{version}-%{release}
+
+%description dbg-static
+Static debug version of STLport library.
+
+%description dbg-static -l pl.UTF-8
+Statyczna wersja diagnostyczna biblioteki STLport.
+
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %build
-%{__make} -C build/lib -f gcc.mak \
+cd build/lib
+
+%{?with_static_gcc:./configure --use-static-gcc}
+
+%{__make} -f gcc.mak \
+	stldbg-shared \
+	stldbg-static \
 	release-shared \
 	release-static \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
+cd ../..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}
 
 %{__make} -C build/lib -f gcc.mak \
+	install-stldbg-shared \
+	install-stldbg-static \
 	install-release-shared \
 	install-release-static \
 	INSTALL_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+	INSTALL_LIB_DIR_STLDBG=$RPM_BUILD_ROOT%{_libdir} \
 	INSTALL_LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 
 cp -a stlport $RPM_BUILD_ROOT%{_includedir}
 rm -rf $RPM_BUILD_ROOT%{_includedir}/stlport/BC50
 
+# let libstlport{,stlg}.so point to real lib, not artificial libstlport{,stlg}.so.5 symlink
+ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlport.so.*.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libstlport.so
+ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlportstlg.so.*.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libstlportstlg.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post	dbg -p /sbin/ldconfig
+%postun dbg -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_libdir}/*.so.*
+%attr(755,root,root) %{_libdir}/libstlport.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libstlport.so.5.1
 
 %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
+
+%files dbg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libstlportstlg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5.1
+
+%files dbg-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libstlportstlg.so
+
+%files dbg-static
+%defattr(644,root,root,755)
+%{_libdir}/libstlportstlg.a