|
|
@@ -11,16 +11,17 @@
|
|
|
Summary: An interpreted, interactive, object-oriented programming language.
|
|
|
Summary(ja): オブジェクト指向言語 Python インタプリタ
|
|
|
Name: python
|
|
|
-Version: %{pybasever}.3
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: %{pybasever}.5
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: PSF
|
|
|
Group: Development/Languages
|
|
|
URL: http://www.python.org/%{pybasever}/
|
|
|
-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: http://docs.python.org/archives/python-%{version}-docs-html.tar.bz2
|
|
|
Source2: http://python-doc-ja.googlecode.com/files/python-doc-%{pybasever}ja1-html.zip
|
|
|
Source6: shmmodule.c
|
|
|
-Patch0: python-2.7.1-Setup.dist.patch
|
|
|
+#Patch0: python-2.7.1-Setup.dist.patch
|
|
|
+Patch0: python-2.7.1-config.patch
|
|
|
Patch3: python-2.2.1-pydocnogui.patch
|
|
|
Patch4: python-2.3.3-distutilrpm.patch
|
|
|
Patch10: python-2.6-db48.patch
|
|
|
@@ -47,6 +48,11 @@ Patch38: python-2.7rc1-socketmodule-constants2.patch
|
|
|
Patch39: python-2.7rc1-statvfs-f_flag-constants.patch
|
|
|
Patch40: python-2.7rc2-r79310.patch
|
|
|
|
|
|
+Patch41: 00121-add-Modules-to-build-path.patch
|
|
|
+Patch42: 00125-less-verbose-COUNT_ALLOCS.patch
|
|
|
+Patch43: 00133-skip-test_dl.patch
|
|
|
+Patch44: 00137-skip-distutils-tests-that-fail-in-rpmbuild.patch
|
|
|
+
|
|
|
## from mandriva
|
|
|
Patch50: Python-2.7-CVE-2010-3493.diff
|
|
|
Patch51: Python-2.7-CVE-2010-3492.diff
|
|
|
@@ -76,7 +82,7 @@ Provides: pysqlite
|
|
|
|
|
|
BuildRequires: db4-devel >= 4.8
|
|
|
BuildRequires: readline-devel
|
|
|
-BuildRequires: libtermcap-devel
|
|
|
+#BuildRequires: libtermcap-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
BuildRequires: gmp-devel
|
|
|
BuildRequires: ncurses-devel
|
|
|
@@ -84,7 +90,7 @@ BuildRequires: gdbm-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
BuildRequires: bzip2-devel
|
|
|
BuildRequires: expat-devel
|
|
|
-BuildRequires: libGL-devel
|
|
|
+BuildRequires: mesa-libGL-devel
|
|
|
BuildRequires: libX11-devel
|
|
|
BuildRequires: libffi-devel
|
|
|
BuildRequires: sqlite3-devel
|
|
|
@@ -215,13 +221,19 @@ user interface for Python programming.
|
|
|
%patch37 -p1 -b .socketmodule-constants
|
|
|
%patch38 -p1 -b .socketmodule-constants2
|
|
|
%patch39 -p1 -b .statvfs-f_flag-constants
|
|
|
-%patch40 -p0 -R -b .r79310
|
|
|
+#%patch40 -p0 -R -b .r79310
|
|
|
+
|
|
|
+## from fedora-rawhide on 2.7.5
|
|
|
+%patch41 -p1
|
|
|
+%patch42 -p1 -b .less-verbose-COUNT_ALLOCS
|
|
|
+%patch43 -p1
|
|
|
+%patch44 -p1
|
|
|
|
|
|
## from mandriva
|
|
|
###%patch50 -p0 -b .CVE-2010-3493
|
|
|
###%patch51 -p1 -b .CVE-2010-3492
|
|
|
###%patch52 -p1 -b .fix_UTF-8_name
|
|
|
-%patch53 -p0 -b .module-linkage.patch
|
|
|
+#%patch53 -p0 -b .module-linkage.patch 5/6
|
|
|
|
|
|
%if %{_lib} == lib64
|
|
|
%patch100 -p1 -b .Makefile
|
|
|
@@ -485,6 +497,14 @@ rm -fr $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jun 15 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.7.5-1
|
|
|
+- new upstream release
|
|
|
+- replaced Patch0,24,25,29 to Fedora rawhide's same one
|
|
|
+- dropt Patch40,53
|
|
|
+- added Patch41,42,43,44 from Fedora
|
|
|
+- changed BuildRequires: libGL-devel to mesa-libGL-devel
|
|
|
+- deleted BuildRequires: libtermcap-devel
|
|
|
+
|
|
|
* Sun Jan 6 2013 IWAI, Masaharu <iwai@alib.jp> 2.7.3-2
|
|
|
- build with Tcl/Tk 8.5.7-1
|
|
|
|
kudoh