diff -r 193650beba33 -r 8a194ef19c9c python/python.spec --- a/python/python.spec Tue Jul 02 18:27:47 2013 +0200 +++ b/python/python.spec Tue Jul 02 21:15:12 2013 +0200 @@ -31,7 +31,7 @@ Class: BASE Group: Language License: GPL -Version: 2.7.3 +Version: 3.3.2 Release: 20120800 # package options @@ -42,7 +42,6 @@ %option with_zlib no %option with_bzip2 no %option with_xml no -%option with_locale no %option with_ssl no # list of sources @@ -52,8 +51,8 @@ # build information BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make PreReq: OpenPKG, openpkg >= 20100101, gcc -BuildPreReq: zlib -PreReq: zlib +BuildPreReq: zlib, gettext, libiconv +PreReq: zlib, gettext, libiconv %if "%{with_readline}" == "yes" BuildPreReq: readline PreReq: readline @@ -82,10 +81,6 @@ BuildPreReq: expat PreReq: expat %endif -%if "%{with_locale}" == "yes" -BuildPreReq: gettext, libiconv -PreReq: gettext, libiconv -%endif %if "%{with_ssl}" == "yes" BuildPreReq: openssl PreReq: openssl @@ -162,10 +157,6 @@ echo "pyexpat pyexpat.c -DHAVE_EXPAT_H %{l_cppflags} %{l_ldflags} -lexpat" ) >>Modules/Setup.local %endif -%if "%{with_locale}" == "yes" - ( echo "_locale _localemodule.c %{l_cppflags} %{l_ldflags} -lintl -liconv" - ) >>Modules/Setup.local -%endif %if "%{with_ssl}" == "yes" ( echo "_socket socketmodule.c" echo "SSL=%{l_prefix}" @@ -184,17 +175,19 @@ CXXFLAGS="%{l_cxxflags -O}" \ CPPFLAGS="$l_cppflags" \ LDFLAGS="%{l_ldflags}" \ + LIBS="-lintl -liconv" \ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --with-dbmliborder=ndbm \ --with-gcc - %{l_make} %{l_mflags -O} + %{l_make} %{l_mflags} %install %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT - ln $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython*.a \ - $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython.a + ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/python/config* + ln libpython*.a libpython.a + ) || exit $? rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/smtpd.py rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/idle rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/python/test