X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=STLport.spec;h=7e3cc4e11c7ab63afe9d34d9e1e38f9e3615b4e3;hb=b6768a4d07be45820bd1b8743750d1607180f5a2;hp=520ffe1dafa489f9b077e4c19cd9aa728ee822bf;hpb=603c79f779cde7dc187cc978133651075276005a;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index 520ffe1..7e3cc4e 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,14 +1,16 @@
 Summary:	C++ standard library
 Summary(pl.UTF-8):	Biblioteki standardowe C++
 Name:		STLport
-Version:	5.1.4
+Version:	5.1.5
 Release:	1
 Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5:	b8d1cba9fd823e1edbfd83b4bbcb237d
+# Source0-md5:	e31d0dc9141c4f264d887754b559cc84
 Patch0:		%{name}-endianness.patch
+Patch1:		%{name}-alpha.patch
+Patch2:		%{name}-valarray-copy-constructor.patch
 URL:		http://stlport.sourceforge.net/
 BuildRequires:	libstdc++-devel >= 6:4.2.0-1
 BuildRequires:	sed >= 4.0
@@ -48,14 +50,55 @@ Static STLport libraries.
 %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
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %build
 %{__make} -C build/lib -f gcc.mak \
+	stldbg-shared \
+	stldbg-static \
 	release-shared \
 	release-static \
 	CC="%{__cc}" \
@@ -66,17 +109,22 @@ 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
 
-# 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{,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
@@ -84,13 +132,14 @@ 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}/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.5.1
 
 %files devel
 %defattr(644,root,root,755)
@@ -101,3 +150,16 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_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