- removed outdated soname,gcc3stdexcept,extra-cxxflags patches

- pass CC,CFLAGS (used for one file)

Changed files:
    STLport.spec -> 1.54

diff --git a/STLport.spec b/STLport.spec
index c3a77117ebf238dedc63c39c5c826b988e019c0f..2c15b235f743f0ee04b0858c7543bcdab2c67df8 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -9,11 +9,8 @@ Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
 # Source0-md5: 5aefcbb0c30a91d50bb2d6c7b30e8393
 Patch0:                %{name}-endianness.patch
-#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
+Patch1:                %{name}-nodebug.patch
+Patch2:                %{name}-gcc34.patch
 URL:           http://stlport.sourceforge.net/
 BuildRequires: libstdc++-devel >= 5:3.3.2
 %requires_eq   libstdc++
@@ -55,18 +52,18 @@ Biblioteki statyczne do STLport.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-
 #patch1 -p1
 #patch2 -p1
-#patch3 -p1
-#patch4 -p1
 
 %build
+# XXX: -fPIC is lost somewhere
 %{__make} -C build/lib -f gcc.mak \
        release-shared \
        release-static \
-       CXXFLAGS="%{rpmcxxflags}" \
-       CXX="%{__cxx}"
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       CFLAGS="%{rpmcflags}" \
+       CXXFLAGS="%{rpmcxxflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT