1.1 --- a/python/python.spec Tue Jul 02 18:27:47 2013 +0200
1.2 +++ b/python/python.spec Tue Jul 02 21:15:12 2013 +0200
1.3 @@ -31,7 +31,7 @@
1.4 Class: BASE
1.5 Group: Language
1.6 License: GPL
1.7 -Version: 2.7.3
1.8 +Version: 3.3.2
1.9 Release: 20120800
1.10
1.11 # package options
1.12 @@ -42,7 +42,6 @@
1.13 %option with_zlib no
1.14 %option with_bzip2 no
1.15 %option with_xml no
1.16 -%option with_locale no
1.17 %option with_ssl no
1.18
1.19 # list of sources
1.20 @@ -52,8 +51,8 @@
1.21 # build information
1.22 BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make
1.23 PreReq: OpenPKG, openpkg >= 20100101, gcc
1.24 -BuildPreReq: zlib
1.25 -PreReq: zlib
1.26 +BuildPreReq: zlib, gettext, libiconv
1.27 +PreReq: zlib, gettext, libiconv
1.28 %if "%{with_readline}" == "yes"
1.29 BuildPreReq: readline
1.30 PreReq: readline
1.31 @@ -82,10 +81,6 @@
1.32 BuildPreReq: expat
1.33 PreReq: expat
1.34 %endif
1.35 -%if "%{with_locale}" == "yes"
1.36 -BuildPreReq: gettext, libiconv
1.37 -PreReq: gettext, libiconv
1.38 -%endif
1.39 %if "%{with_ssl}" == "yes"
1.40 BuildPreReq: openssl
1.41 PreReq: openssl
1.42 @@ -162,10 +157,6 @@
1.43 echo "pyexpat pyexpat.c -DHAVE_EXPAT_H %{l_cppflags} %{l_ldflags} -lexpat"
1.44 ) >>Modules/Setup.local
1.45 %endif
1.46 -%if "%{with_locale}" == "yes"
1.47 - ( echo "_locale _localemodule.c %{l_cppflags} %{l_ldflags} -lintl -liconv"
1.48 - ) >>Modules/Setup.local
1.49 -%endif
1.50 %if "%{with_ssl}" == "yes"
1.51 ( echo "_socket socketmodule.c"
1.52 echo "SSL=%{l_prefix}"
1.53 @@ -184,17 +175,19 @@
1.54 CXXFLAGS="%{l_cxxflags -O}" \
1.55 CPPFLAGS="$l_cppflags" \
1.56 LDFLAGS="%{l_ldflags}" \
1.57 + LIBS="-lintl -liconv" \
1.58 ./configure \
1.59 --prefix=%{l_prefix} \
1.60 --mandir=%{l_prefix}/man \
1.61 --with-dbmliborder=ndbm \
1.62 --with-gcc
1.63 - %{l_make} %{l_mflags -O}
1.64 + %{l_make} %{l_mflags}
1.65
1.66 %install
1.67 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.68 - ln $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython*.a \
1.69 - $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython.a
1.70 + ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/python/config*
1.71 + ln libpython*.a libpython.a
1.72 + ) || exit $?
1.73 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/smtpd.py
1.74 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/idle
1.75 rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/python/test
