1.1 --- a/stlport/stlport.spec Thu Jan 08 01:12:39 2009 +0100
1.2 +++ b/stlport/stlport.spec Thu Jan 08 01:13:59 2009 +0100
1.3 @@ -31,14 +31,15 @@
1.4 Class: EVAL
1.5 Group: Language
1.6 License: STLport
1.7 -Version: 5.0.2
1.8 -Release: 20080101
1.9 +Version: 5.2.1
1.10 +Release: 20090106
1.11
1.12 # package options
1.13 %option with_debug yes
1.14
1.15 # list of sources
1.16 Source0: http://switch.dl.sourceforge.net/stlport/STLport-%{version}.tar.gz
1.17 +Patch0: stlport.patch
1.18
1.19 # build information
1.20 Prefix: %{l_prefix}
1.21 @@ -66,12 +67,19 @@
1.22 }
1.23
1.24 %prep
1.25 - %setup -q -n STLport
1.26 + %setup -q -n STLport-%{version}
1.27 + %patch -p0
1.28 %{l_shtool} subst \
1.29 - -e 's;\(define _STLP_NATIVE_INCLUDE_PATH\).*;\1 %{l_prefix}/include/g++;' \
1.30 - stlport/config/stl_gcc.h
1.31 + -e 's;^\(# if defined (__QNXNTO__) || ( defined(__GNUC__)\) && defined(__APPLE__) );\1;' \
1.32 + src/num_put_float.cpp
1.33 %{l_shtool} subst \
1.34 - -e 's;^\(# if defined (__QNXNTO__) || ( defined(__GNUC__)\) && defined(__APPLE__);\1;' \
1.35 + -e 's/__f->_file;/fileno((FILE *)__f);/g' \
1.36 + src/_stdio_file.h
1.37 + %{l_shtool} subst \
1.38 + -e 's;\(_STLP_STATIC_ASSERT( sizeof(long double).*\);//\1;' \
1.39 + src/num_get_float.cpp
1.40 + %{l_shtool} subst \
1.41 + -e 's;( \(defined(__GNUC__)\);\1;' \
1.42 src/num_put_float.cpp
1.43
1.44 %build
1.45 @@ -79,7 +87,7 @@
1.46 %if "%{with_debug}" == "yes"
1.47 buildtargets="$buildtargets dbg-static stldbg-static"
1.48 %endif
1.49 - cd build/lib && %{l_make} %{l_mflags} -f gcc.mak $buildtargets
1.50 + cd build/lib && %{l_make} %{l_mflags -O} -f gcc.mak $buildtargets
1.51
1.52 %install
1.53 rm -rf $RPM_BUILD_ROOT
