- back to 5.1.0 (5.0.2 left on STLport-5_0 branch); ooo builds on 5.1.0 now

- endianness patch updated; type_promotion needs update if really needed

Changed files:
    STLport.spec -> 1.68

diff --git a/STLport.spec b/STLport.spec
index de1728ce4ae256cecef536aea2ac86723f39f03f..85999a3fde5ba62eabda21d830c1c9b31990eef1 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,18 +1,17 @@
-# 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.2
-Release:       4
+Version:       5.1.0
+Release:       1
 Epoch:         2
 License:       distributable (see README.gz)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5: 784be5e0499009aeea6e9ec8f7259c41
+# Source0-md5: dcf079313e7e0d7870307b74b658bb81
 Patch0:                %{name}-endianness.patch
 Patch1:                %{name}-type_promotion.patch
 Patch2:                %{name}-gcc420_dirty_hack.patch
+Patch3:                %{name}-gcc420.patch
 URL:           http://stlport.sourceforge.net/
 BuildRequires: libstdc++-devel >= 5:3.3.2
 BuildRequires: sed >= 4.0
@@ -53,10 +52,12 @@ Static STLport libraries.
 Biblioteki statyczne do STLport.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
-%patch1 -p1
+# UPDATE or DROP (needed?)
+#%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
@@ -94,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{FAQ,*.txt}
-%{_includedir}/stlport
 %attr(755,root,root) %{_libdir}/*.so
+%{_includedir}/stlport
 
 %files static
 %defattr(644,root,root,755)