X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=STLport.spec;h=f3f4970b52ec28b39deb328e63164be863a8e777;hb=f195bd270661ddfb37dca510ff17db4e44666585;hp=b66e7bc69dfdfb1507223a96905935e9b7919022;hpb=281a602b7ddef5412f21bd59155e35432a9ce446;p=packages%2FSTLport.git

diff --git a/STLport.spec b/STLport.spec
index b66e7bc..f3f4970 100644
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,20 +1,20 @@
-Summary:	Complete C++ standard library
-Summary(pl):	Pe³na biblioteka standardowa C++
+Summary:	C++ standard library
+Summary(pl):	Biblioteki standardowe C++
 Name:		STLport
-Version:	4.6
-Release:	0.1
+Version:	4.6.1
+Release:	1
+Epoch:		2
 License:	distributable (see README.gz)
 Group:		Libraries
 Source0:	http://www.stlport.com/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	e2308d3b410310168397ad20e8517862
+# Source0-md5:	383cb0e06bb6cebd6c852b478081d54c
 Patch0:		%{name}-nodebug.patch
-#Patch1:		%{name}-gcc3.patch
-Patch2:		%{name}-4.5.3-gcc3stdexcept.patch
-Patch3:		%{name}-4.5.3-extra-cxxflags.patch
-Patch4:		%{name}-soname.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/
-BuildRequires:	libstdc++-devel >= 5:3.3.1
-# rationale: the -gcc3.patch
+BuildRequires:	libstdc++-devel >= 5:3.3.2
 %requires_eq	libstdc++
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,7 +31,7 @@ u
 Summary:	STLport heades files, documentation
 Summary(pl):	Pliki nag³ówkowe i dokumentacja do STLport
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files and development documentation for STLport.
@@ -43,7 +43,7 @@ Pliki nag
 Summary:	Static STLport libraries
 Summary(pl):	Biblioteki statyczne do STLport
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static STLport libraries.
@@ -54,25 +54,21 @@ Biblioteki statyczne do STLport.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
 %build
-cd src
 CXXFLAGS="%{rpmcflags}" \
-%{__make} -f gcc.mak
+%{__make} -C src -f gcc.mak
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
 
-rm -fr stlport/{BC50,old_hp,*.orig,*/*.orig,config/new_compiler}
-cp -fr stlport $RPM_BUILD_ROOT%{_includedir}
-install lib/*.a $RPM_BUILD_ROOT%{_libdir}
-install lib/*.so.* $RPM_BUILD_ROOT%{_libdir}
-ln -sf libstlport_gcc.so.4.6 $RPM_BUILD_ROOT%{_libdir}/libstlport_gcc.so
+%{__make} -C src -f gcc.mak install \
+	INSTALLDIR=$RPM_BUILD_ROOT%{_prefix} \
+	INSTALLDIR_LIB=$RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,7 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/{images,README.gcc.html,[a-z]*.html}
 %{_includedir}/stlport
-#%%{_libdir}/*.so
 
 %files static
 %defattr(644,root,root,755)