- back to 5.1.0

[packages/STLport.git] / STLport.spec

diff --git a/STLport.spec b/STLport.spec
index 2c15b235f743f0ee04b0858c7543bcdab2c67df8..de1728ce4ae256cecef536aea2ac86723f39f03f 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,18 +1,21 @@
+# NOTICE:
+#      probably doesn't build with libstdc++ < 4.2.0-200612 (<= 4.1.2 should be OK)
 Summary:       C++ standard library
 Summary(pl):   Biblioteki standardowe C++
 Name:          STLport
-Version:       5.0.0
-Release:       0.1
+Version:       5.0.2
+Release:       4
 Epoch:         2
 License:       distributable (see README.gz)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5: 5aefcbb0c30a91d50bb2d6c7b30e8393
+# Source0-md5: 784be5e0499009aeea6e9ec8f7259c41
 Patch0:                %{name}-endianness.patch
-Patch1:                %{name}-nodebug.patch
-Patch2:                %{name}-gcc34.patch
+Patch1:                %{name}-type_promotion.patch
+Patch2:                %{name}-gcc420_dirty_hack.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)
 
@@ -52,18 +55,17 @@ Biblioteki statyczne do STLport.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-#patch1 -p1
-#patch2 -p1
+%patch1 -p1
+%patch2 -p1
+
+sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %build
-# XXX: -fPIC is lost somewhere
 %{__make} -C build/lib -f gcc.mak \
        release-shared \
        release-static \
        CC="%{__cc}" \
-       CXX="%{__cxx}" \
-       CFLAGS="%{rpmcflags}" \
-       CXXFLAGS="%{rpmcxxflags}"
+       CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,13 +89,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_libdir}/*.so.*.*
-%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/*.so.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{FAQ,*.txt}
 %{_includedir}/stlport
+%attr(755,root,root) %{_libdir}/*.so
 
 %files static
 %defattr(644,root,root,755)