SPECS: STLport.spec - updated to 5.2.1.

pluto pluto at pld-linux.org
Tue Dec 16 10:23:12 CET 2008


Author: pluto                        Date: Tue Dec 16 09:23:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 5.2.1.

---- Files affected:
SPECS:
   STLport.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: SPECS/STLport.spec
diff -u SPECS/STLport.spec:1.101 SPECS/STLport.spec:1.102
--- SPECS/STLport.spec:1.101	Tue Oct 28 11:19:13 2008
+++ SPECS/STLport.spec	Tue Dec 16 10:23:06 2008
@@ -6,21 +6,18 @@
 Summary:	C++ standard library
 Summary(pl.UTF-8):	Biblioteki standardowe C++
 Name:		STLport
-Version:	5.1.6
+Version:	5.2.1
 Release:	1
 Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5:	1f718b6c8f892927754a6b5c05b4ccc8
+# 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
-Patch3:		%{name}-vendor_gcc_detection.patch
-Patch4:		%{name}-fstream.patch
 URL:		http://stlport.sourceforge.net/
 BuildRequires:	libstdc++-devel >= 6:4.2.0-1
 BuildRequires:	sed >= 4.0
@@ -99,9 +96,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
@@ -110,19 +104,18 @@
 cp -a %{SOURCE3} stlport-debug.pc.in
 
 %build
-cd build/lib
+./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
 
-%{?with_static_gcc:./configure --use-static-gcc}
-
-%{__make} -f gcc.mak \
-	stldbg-shared \
-	stldbg-static \
-	release-shared \
-	release-static \
-	CC="%{__cc}" \
-	CXX="%{__cxx}"
-
-cd ../..
+%{__make}
 
 subst='
 	s, at prefix@,%{_prefix},g
@@ -141,17 +134,9 @@
 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} 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.*.*.*) \
@@ -159,7 +144,6 @@
 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}
@@ -178,7 +162,7 @@
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_libdir}/libstlport.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libstlport.so.5.1
+%attr(755,root,root) %ghost %{_libdir}/libstlport.so.5.2
 %attr(755,root,root) %ghost %{_libdir}/libstlport.so.5
 
 %files devel
@@ -196,7 +180,7 @@
 %files dbg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libstlportstlg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5.1
+%attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5.2
 %attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5
 
 %files dbg-devel
@@ -214,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2008/12/16 09:23:06  pluto
+- updated to 5.2.1.
+
 Revision 1.101  2008/10/28 10:19:13  pluto
 - updated to 5.1.6 (fix string::replace() for selfreferencing strings).
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/STLport.spec?r1=1.101&r2=1.102&f=u



More information about the pld-cvs-commit mailing list