diff --git a/python27-2.7.3-lib64.patch b/python27-2.7.8-lib64.patch similarity index 91% rename from python27-2.7.3-lib64.patch rename to python27-2.7.8-lib64.patch index 048a1cf..08d20bf 100644 --- a/python27-2.7.3-lib64.patch +++ b/python27-2.7.8-lib64.patch @@ -128,19 +128,17 @@ diff -up Python-2.6.8/Modules/getpath.c.lib64 Python-2.6.8/Modules/getpath.c # Interface to the Expat XML parser # -diff -up Python-2.6.8/setup.py.lib64 Python-2.6.8/setup.py ---- Python-2.6.8/setup.py.lib64 2012-04-12 13:23:24.657431631 -0400 -+++ Python-2.6.8/setup.py 2012-04-12 13:23:24.935428157 -0400 -@@ -356,7 +356,7 @@ class PyBuildExt(build_ext): - - def detect_modules(self): +--- Python-2.7.8/setup.py.orig 2014-06-30 04:05:48.000000000 +0200 ++++ Python-2.7.8/setup.py 2014-11-23 18:08:31.091091727 +0100 +@@ -439,6 +439,7 @@ # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and -@@ -677,11 +677,11 @@ class PyBuildExt(build_ext): + if not cross_compiling: + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() +@@ -760,11 +761,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -154,7 +152,7 @@ diff -up Python-2.6.8/setup.py.lib64 Python-2.6.8/setup.py extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -703,8 +703,8 @@ class PyBuildExt(build_ext): +@@ -799,8 +800,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, diff --git a/python27.spec b/python27.spec index bb3182f..4d48bbc 100644 --- a/python27.spec +++ b/python27.spec @@ -6,15 +6,15 @@ #% define __libdir %{_prefix}/lib %define __libdir %{_libdir} Name: python27 -Version: 2.7.3 -Release: 9mamba +Version: 2.7.8 +Release: 1mamba Summary: An interpreted, interactive, object-oriented programming language Group: Applications/Development Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.python.org -Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 +Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz Source1: python-2.7-macros.python Source2: python-macros.python Patch1: %{name}-2.7.3-cgi.patch @@ -25,7 +25,7 @@ Patch5: Python-2.6.5-xcompile.patch Patch6: python-2.6.7-pkgconfig.patch Patch7: python27-2.7.3-gcc-4.8.patch Patch8: python-2.7.3-use_system_Sphinx.patch -Patch9: python27-2.7.3-lib64.patch +Patch9: python27-2.7.8-lib64.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -156,8 +156,8 @@ This package contains the tk library for Python. %if "%{_host}" != "%{_build}" %patch5 -p1 %endif -%patch7 -p1 -%patch8 -p1 +#%patch7 -p1 +#%patch8 -p1 %ifarch x86_64 %patch9 -p1 %endif @@ -359,6 +359,9 @@ exit 0 %endif %changelog +* Sun Nov 23 2014 Silvan Calarco 2.7.8-1mamba +- update to 2.7.8 + * Sat Feb 15 2014 Silvan Calarco 2.7.3-9mamba - move pyconfig.h and %{__libdir}/python/config from libpython27 to python27