changeset
Update to new vendor version and adjust dependencies to correct build.
Tue, 02 Jul 2013 21:15:12 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 02 Jul 2013 21:15:12 +0200
- changeset 784
- 8a194ef19c9c
- parent 783
- 193650beba33
- child 785
- 2dc2b78e44e7
Update to new vendor version and adjust dependencies to correct build.
| python/python.patch | file | annotate | diff | comparison | revisions | |
| python/python.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/python/python.patch Tue Jul 02 18:27:47 2013 +0200 1.2 +++ b/python/python.patch Tue Jul 02 21:15:12 2013 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 Index: configure 1.5 --- configure.orig 2011-06-11 17:46:28.000000000 +0200 1.6 +++ configure 2011-12-11 16:42:17.000000000 +0100 1.7 -@@ -3920,9 +3920,9 @@ 1.8 +@@ -4241,9 +4241,9 @@ 1.9 CFLAGS=$ac_save_CFLAGS 1.10 elif test $ac_cv_prog_cc_g = yes; then 1.11 if test "$GCC" = yes; then 1.12 @@ -13,7 +13,7 @@ 1.13 fi 1.14 else 1.15 if test "$GCC" = yes; then 1.16 -@@ -5425,7 +5425,7 @@ 1.17 +@@ -6232,7 +6232,7 @@ 1.18 # debug builds. 1.19 OPT="-g -O0 -Wall $STRICT_PROTO" 1.20 else 1.21 @@ -22,7 +22,7 @@ 1.22 fi 1.23 ;; 1.24 *) 1.25 -@@ -7813,7 +7813,7 @@ 1.26 +@@ -8618,7 +8618,7 @@ 1.27 then 1.28 LINKFORSHARED="-Wl,--export-dynamic" 1.29 fi;; 1.30 @@ -34,18 +34,18 @@ 1.31 Index: setup.py 1.32 --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200 1.33 +++ setup.py 2011-12-11 16:43:40.000000000 +0100 1.34 -@@ -369,8 +369,8 @@ 1.35 - 1.36 - def detect_modules(self): 1.37 - # Ensure that /usr/local is always used 1.38 -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 1.39 -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 1.40 -+ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') 1.41 -+ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') 1.42 - self.add_multiarch_paths() 1.43 - 1.44 - # Add paths specified in the environment variables LDFLAGS and 1.45 -@@ -703,8 +703,6 @@ 1.46 +@@ -439,8 +439,8 @@ 1.47 + # directories (i.e. '.' and 'Include') must be first. See issue 1.48 + # 10520. 1.49 + if not cross_compiling: 1.50 +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 1.51 +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 1.52 ++ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') 1.53 ++ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') 1.54 + # only change this for cross builds for 3.3, issues on Mageia 1.55 + if cross_compiling: 1.56 + self.add_gcc_paths() 1.57 +@@ -741,8 +741,6 @@ 1.58 depends = ['socketmodule.h']) ) 1.59 # Detect SSL support for the socket module (via _ssl) 1.60 search_for_ssl_incs_in = [ 1.61 @@ -54,7 +54,7 @@ 1.62 ] 1.63 ssl_incs = find_file('openssl/ssl.h', inc_dirs, 1.64 search_for_ssl_incs_in 1.65 -@@ -715,8 +713,7 @@ 1.66 +@@ -753,8 +751,7 @@ 1.67 if krb5_h: 1.68 ssl_incs += krb5_h 1.69 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, 1.70 @@ -64,7 +64,7 @@ 1.71 ] ) 1.72 1.73 if (ssl_incs is not None and 1.74 -@@ -836,14 +833,8 @@ 1.75 +@@ -866,14 +863,8 @@ 1.76 # top of the normal inc_dirs. 1.77 db_inc_paths = [ 1.78 '/usr/include/db4', 1.79 @@ -79,7 +79,7 @@ 1.80 ] 1.81 # 4.x minor number specific paths 1.82 for x in gen_db_minor_ver_nums(4): 1.83 -@@ -1731,6 +1722,7 @@ 1.84 +@@ -1652,6 +1643,7 @@ 1.85 dotversion = dotversion[:-1] + '.' + dotversion[-1] 1.86 tcl_include_sub = [] 1.87 tk_include_sub = []
2.1 --- a/python/python.spec Tue Jul 02 18:27:47 2013 +0200 2.2 +++ b/python/python.spec Tue Jul 02 21:15:12 2013 +0200 2.3 @@ -31,7 +31,7 @@ 2.4 Class: BASE 2.5 Group: Language 2.6 License: GPL 2.7 -Version: 2.7.3 2.8 +Version: 3.3.2 2.9 Release: 20120800 2.10 2.11 # package options 2.12 @@ -42,7 +42,6 @@ 2.13 %option with_zlib no 2.14 %option with_bzip2 no 2.15 %option with_xml no 2.16 -%option with_locale no 2.17 %option with_ssl no 2.18 2.19 # list of sources 2.20 @@ -52,8 +51,8 @@ 2.21 # build information 2.22 BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make 2.23 PreReq: OpenPKG, openpkg >= 20100101, gcc 2.24 -BuildPreReq: zlib 2.25 -PreReq: zlib 2.26 +BuildPreReq: zlib, gettext, libiconv 2.27 +PreReq: zlib, gettext, libiconv 2.28 %if "%{with_readline}" == "yes" 2.29 BuildPreReq: readline 2.30 PreReq: readline 2.31 @@ -82,10 +81,6 @@ 2.32 BuildPreReq: expat 2.33 PreReq: expat 2.34 %endif 2.35 -%if "%{with_locale}" == "yes" 2.36 -BuildPreReq: gettext, libiconv 2.37 -PreReq: gettext, libiconv 2.38 -%endif 2.39 %if "%{with_ssl}" == "yes" 2.40 BuildPreReq: openssl 2.41 PreReq: openssl 2.42 @@ -162,10 +157,6 @@ 2.43 echo "pyexpat pyexpat.c -DHAVE_EXPAT_H %{l_cppflags} %{l_ldflags} -lexpat" 2.44 ) >>Modules/Setup.local 2.45 %endif 2.46 -%if "%{with_locale}" == "yes" 2.47 - ( echo "_locale _localemodule.c %{l_cppflags} %{l_ldflags} -lintl -liconv" 2.48 - ) >>Modules/Setup.local 2.49 -%endif 2.50 %if "%{with_ssl}" == "yes" 2.51 ( echo "_socket socketmodule.c" 2.52 echo "SSL=%{l_prefix}" 2.53 @@ -184,17 +175,19 @@ 2.54 CXXFLAGS="%{l_cxxflags -O}" \ 2.55 CPPFLAGS="$l_cppflags" \ 2.56 LDFLAGS="%{l_ldflags}" \ 2.57 + LIBS="-lintl -liconv" \ 2.58 ./configure \ 2.59 --prefix=%{l_prefix} \ 2.60 --mandir=%{l_prefix}/man \ 2.61 --with-dbmliborder=ndbm \ 2.62 --with-gcc 2.63 - %{l_make} %{l_mflags -O} 2.64 + %{l_make} %{l_mflags} 2.65 2.66 %install 2.67 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.68 - ln $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython*.a \ 2.69 - $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython.a 2.70 + ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/python/config* 2.71 + ln libpython*.a libpython.a 2.72 + ) || exit $? 2.73 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/smtpd.py 2.74 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/idle 2.75 rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/python/test
