diff --git a/python/python.patch b/python/python.patch index 085b18e126..99462f74b2 100644 --- a/python/python.patch +++ b/python/python.patch @@ -1,7 +1,7 @@ Index: configure ---- configure.orig 2013-05-12 05:32:54.000000000 +0200 -+++ configure 2013-05-16 19:31:55.823608839 +0200 -@@ -4164,9 +4164,9 @@ +--- configure.orig 2013-11-10 08:36:41.000000000 +0100 ++++ configure 2013-11-11 20:27:13.631685404 +0100 +@@ -4173,9 +4173,9 @@ CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -13,7 +13,7 @@ Index: configure fi else if test "$GCC" = yes; then -@@ -5935,7 +5935,7 @@ +@@ -5944,7 +5944,7 @@ # debug builds. OPT="-g -O0 -Wall $STRICT_PROTO" else @@ -22,7 +22,7 @@ Index: configure fi ;; *) -@@ -8379,7 +8379,7 @@ +@@ -8387,7 +8387,7 @@ then LINKFORSHARED="-Wl,--export-dynamic" fi;; @@ -32,20 +32,20 @@ Index: configure if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null then Index: setup.py ---- setup.py.orig 2013-05-12 05:32:54.000000000 +0200 -+++ setup.py 2013-05-16 19:32:53.624599167 +0200 -@@ -437,8 +437,8 @@ - +--- setup.py.orig 2013-11-10 08:36:41.000000000 +0100 ++++ setup.py 2013-11-11 20:29:57.332193766 +0100 +@@ -438,8 +438,8 @@ def detect_modules(self): # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') -+ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') - self.add_gcc_paths() + if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') ++ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') + if cross_compiling: + self.add_gcc_paths() self.add_multiarch_paths() - -@@ -783,8 +783,6 @@ +@@ -785,8 +785,6 @@ libraries=math_libs) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ @@ -54,7 +54,7 @@ Index: setup.py ] ssl_incs = find_file('openssl/ssl.h', inc_dirs, search_for_ssl_incs_in -@@ -795,8 +793,7 @@ +@@ -797,8 +795,7 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -64,7 +64,7 @@ Index: setup.py ] ) if (ssl_incs is not None and -@@ -920,14 +917,8 @@ +@@ -922,14 +919,8 @@ # top of the normal inc_dirs. db_inc_paths = [ '/usr/include/db4', @@ -79,7 +79,7 @@ Index: setup.py ] # 4.x minor number specific paths for x in gen_db_minor_ver_nums(4): -@@ -1839,6 +1830,7 @@ +@@ -1888,6 +1879,7 @@ dotversion = dotversion[:-1] + '.' + dotversion[-1] tcl_include_sub = [] tk_include_sub = [] diff --git a/python/python.spec b/python/python.spec index 663d60919f..2177172d52 100644 --- a/python/python.spec +++ b/python/python.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: BASE Group: Language License: GPL -Version: 2.7.5 -Release: 20130516 +Version: 2.7.6 +Release: 20131111 # package options %option with_readline no @@ -46,7 +46,7 @@ Release: 20130516 %option with_ssl no # list of sources -Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 +Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tgz Patch0: python.patch # build information