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

[packages/STLport.git] / STLport.spec

diff --git a/STLport.spec b/STLport.spec
index d9cf681f033df59238ad71a03d79e86bcde72db4..85999a3fde5ba62eabda21d830c1c9b31990eef1 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,20 +1,20 @@
 Summary:       C++ standard library
 Summary(pl):   Biblioteki standardowe C++
 Name:          STLport
-Version:       4.6.2
-Release:       3
+Version:       5.1.0
+Release:       1
 Epoch:         2
 License:       distributable (see README.gz)
 Group:         Libraries
-Source0:       http://www.stlport.com/archive/%{name}-%{version}.tar.gz
-# Source0-md5: 4c01c84f1212369ceb369567ed06d1a2
-Patch0:                %{name}-nodebug.patch
-Patch1:                %{name}-soname.patch
-Patch2:                %{name}-gcc34.patch
-Patch3:                %{name}-4.5.3-gcc3stdexcept.patch
-Patch4:                %{name}-4.5.3-extra-cxxflags.patch
-URL:           http://www.stlport.org/
+Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
+# 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
 %requires_eq   libstdc++
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,22 +54,32 @@ Biblioteki statyczne do STLport.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# UPDATE or DROP (needed?)
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %build
-%{__make} -C src -f gcc.mak \
-       CXXFLAGS="%{rpmcxxflags}" \
+%{__make} -C build/lib -f gcc.mak \
+       release-shared \
+       release-static \
+       CC="%{__cc}" \
        CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_includedir}
+
+%{__make} -C build/lib -f gcc.mak \
+       install-release-shared \
+       install-release-static \
+       INSTALL_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+       INSTALL_LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 
-%{__make} -C src -f gcc.mak install \
-       INSTALLDIR=$RPM_BUILD_ROOT%{_prefix} \
-       INSTALLDIR_LIB=$RPM_BUILD_ROOT%{_libdir}
+cp -a stlport $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_includedir}/stlport/BC50
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,12 +90,12 @@ 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/{images,README.gcc.html,[a-z]*.html}
+%doc doc/{FAQ,*.txt}
+%attr(755,root,root) %{_libdir}/*.so
 %{_includedir}/stlport
 
 %files static