diff --git a/.gitignore b/.gitignore index c2cf9a1..dafa321 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -Python-2.7.tar.bz2 -/Python-2.7.1.tar.bz2 -/Python-2.7.2.tar.bz2 +/*.tar.* diff --git a/python.spec b/python.spec index c098721..5a26f8a 100644 --- a/python.spec +++ b/python.spec @@ -108,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: Version: 2.7.2 -Release: 17%{?dist} +Release: 18%{?dist} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} @@ -167,7 +167,7 @@ BuildRequires: zlib-devel # Source code and patches # ======================= -Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 +Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz # Work around bug 562906 until it's fixed in rpm-build by providing a fixed # version of pythondeps.sh: @@ -930,6 +930,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -fwrapv" export CPPFLAGS="$(pkg-config --cflags-only-I libffi)" export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -fwrapv" export LINKCC="gcc" +export LDFLAGS="$RPM_LD_FLAGS" if pkg-config openssl ; then export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)" export LDFLAGS="$LDFLAGS $(pkg-config --libs-only-L openssl)" @@ -1734,6 +1735,10 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Thu Nov 24 2011 Ville Skyttä - 2.7.2-18 +- Build with $RPM_LD_FLAGS (#756862). +- Use xz-compressed source tarball. + * Wed Oct 26 2011 Fedora Release Engineering - 2.7.2-17 - Rebuilt for glibc bug#747377 diff --git a/sources b/sources index 44a6a4f..c3dd414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba7b2f11ffdbf195ee0d111b9455a5bd Python-2.7.2.tar.bz2 +75c87a80c6ddb0b785a57ea3583e04fa Python-2.7.2.tar.xz