X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=STLport.spec;h=6e8a72197d704e39ae5ad4d87b8f80be05c2ad7b;hb=83a90c09df34ce8d1efbe60a5de8f15a76ff892d;hp=dd7c94cfdc43e2b0af9fbced1e9dc3d0abaf8d2d;hpb=22039b89c882536aa0188e4deaf56c5192e2b3d7;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index dd7c94c..6e8a721 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,20 +1,25 @@
+#
+# Conditional build:
+%bcond_with	static_gcc	# linkg libgcc* statically into libstlport.
+#
 Summary:	C++ standard library
 Summary(pl.UTF-8):	Biblioteki standardowe C++
 Name:		STLport
-Version:	5.1.4
-Release:	3
+Version:	5.2.1
+Release:	2
 Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5:	b8d1cba9fd823e1edbfd83b4bbcb237d
+# Source0-md5:	a8341363e44d9d06a60e03215b38ddde
+Source1:	stlport-config.in
+Source2:	stlport.pc.in
+Source3:	stlport-debug.pc.in
 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
-%requires_eq	libstdc++
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,38 +55,87 @@ 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
+
+%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
 
+cp -a %{SOURCE1} stlport-config.in
+cp -a %{SOURCE2} stlport.pc.in
+cp -a %{SOURCE3} stlport-debug.pc.in
+
 %build
-%{__make} -C build/lib -f gcc.mak \
-	stldbg-shared \
-	stldbg-static \
-	release-shared \
-	release-static \
-	CC="%{__cc}" \
-	CXX="%{__cxx}"
+./configure \
+	--prefix=%{_prefix} \
+	--includedir=%{_includedir} \
+	--libdir=%{_libdir} \
+	--with-cc=%{__cc} \
+	--with-cxx=%{__cxx} \
+	--without-debug \
+	--enable-static \
+	%{?with_static_gcc:--use-static-gcc} \
+	--use-compiler-family=gcc
+
+%{__make}
+
+subst='
+	s,@prefix@,%{_prefix},g
+	s,@exec_prefix@,%{_exec_prefix},g
+	s,@libdir@,%{_libdir},g
+	s,@includedir@,%{_includedir},g
+	s,@ver@,%{version},g
+	s,@VERSION@,%{version},g
+'
+
+%{__sed} -e "$subst" stlport-config.in > stlport-config
+%{__sed} -e "$subst" stlport.pc.in > stlport.pc
+%{__sed} -e "$subst" stlport-debug.pc.in > stlport-debug.pc
 
 %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
+%{__make} -j1 install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	INSTALL_LIB_DIR_STLDBG=$RPM_BUILD_ROOT%{_libdir}
 
 # let libstlport{,stlg}.so point to real lib, not artificial libstlport{,stlg}.so.5 symlink
 ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlport.so.*.*.*) \
@@ -89,29 +143,50 @@ ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlport.so.*.*.*) \
 ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlportstlg.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libstlportstlg.so
 
+install -d $RPM_BUILD_ROOT{%{_pkgconfigdir},%{_bindir}}
+cp -a stlport.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+cp -a stlport-debug.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+install stlport-config $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post	-p /sbin/ldconfig devel
-%postun -p /sbin/ldconfig devel
+%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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libstlport.so.5.2
+%attr(755,root,root) %ghost %{_libdir}/libstlport.so.5
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{FAQ,*.txt}
 %attr(755,root,root) %{_libdir}/libstlport.so
-%attr(755,root,root) %{_libdir}/libstlportstlg.so
-%attr(755,root,root) %{_libdir}/libstlportstlg.so.*.*.*
+%attr(755,root,root) %{_bindir}/stlport-config
 %{_includedir}/stlport
+%{_pkgconfigdir}/stlport.pc
 
 %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.2
+%attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5
+
+%files dbg-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libstlportstlg.so
+%{_pkgconfigdir}/stlport-debug.pc
+
+%files dbg-static
+%defattr(644,root,root,755)
 %{_libdir}/libstlportstlg.a