[packages/python] - up to 2.7.10

arekm arekm at pld-linux.org
Mon May 25 00:06:40 CEST 2015


commit 0b87845d2efe8ebe0ef522e2eb815dfe6d24901e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon May 25 00:06:35 2015 +0200

    - up to 2.7.10

 python-pythonpath.patch | 43 -------------------------------------------
 python.spec             |  8 ++++----
 2 files changed, 4 insertions(+), 47 deletions(-)
---
diff --git a/python.spec b/python.spec
index d49f5b0..b1cf086 100644
--- a/python.spec
+++ b/python.spec
@@ -42,15 +42,15 @@ Summary(ru.UTF-8):	Язык программирования очень высо
 Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python
-Version:	%{py_ver}.9
-Release:	3
+Version:	%{py_ver}.10
+Release:	1
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
 Source0:	http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.xz
-# Source0-md5:	38d530f7efc373d64a8fb1637e3baaa7
+# Source0-md5:	c685ef0b8e9f27b5e3db5db12b268ac6
 Source1:	http://www.python.org/ftp/python/doc/%{dver}/%{name}-%{dver}-docs-html.tar.bz2
-# Source1-md5:	8804bc888f6b7a1cc217be1acbb59ad6
+# Source1-md5:	545fef39b52b15641f6936c623150c63
 Patch0:		%{name}-db.patch
 Patch1:		%{name}-pythonpath.patch
 Patch2:		%{name}-ac_fixes.patch
diff --git a/python-pythonpath.patch b/python-pythonpath.patch
index c6ac3ee..b0d9536 100644
--- a/python-pythonpath.patch
+++ b/python-pythonpath.patch
@@ -205,49 +205,6 @@ diff -urN Python-2.7.org/Misc/HISTORY Python-2.7/Misc/HISTORY
  demo/scripts/fixps.py will update old scripts in place (you can easily
  modify it to do other similar changes).
  
-diff -urN Python-2.7.org/Misc/RPM/python-2.7.spec Python-2.7/Misc/RPM/python-2.7.spec
---- Python-2.7.org/Misc/RPM/python-2.7.spec	2010-07-03 15:56:13.000000000 +0200
-+++ Python-2.7/Misc/RPM/python-2.7.spec	2010-07-05 20:00:03.579531210 +0200
-@@ -159,10 +159,10 @@
- 
- * Sat Mar 27 2004 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.2-3pydotorg]
- - Being more agressive about finding the paths to fix for
--  #!/usr/local/bin/python.
-+  #!/usr/bin/python.
- 
- * Sat Feb 07 2004 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.3-2pydotorg]
--- Adding code to remove "#!/usr/local/bin/python" from particular files and
-+- Adding code to remove "#!/usr/bin/python" from particular files and
-   causing the RPM build to terminate if there are any unexpected files
-   which have that line in them.
- 
-@@ -317,7 +317,7 @@
- 
- #  fix the #! line in installed files
- find "$RPM_BUILD_ROOT" -type f -print0 |
--      xargs -0 grep -l /usr/local/bin/python | while read file
-+      xargs -0 grep -l /usr/bin/python | while read file
- do
-    FIXFILE="$file"
-    sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
-@@ -327,7 +327,7 @@
- done
- 
- #  check to see if there are any straggling #! lines
--find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
-+find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python' \
-       | grep ':1:#!' >/tmp/python-rpm-files.$$ || true
- if [ -s /tmp/python-rpm-files.$$ ]
- then
-@@ -335,7 +335,7 @@
-    cat /tmp/python-rpm-files.$$
-    cat <<@EOF
-    *****************************************************
--     There are still files referencing /usr/local/bin/python in the
-+     There are still files referencing /usr/bin/python in the
-      install directory.  They are listed above.  Please fix the .spec
-      file and try again.  If you are an end-user, you probably want
-      to report this to jafo-rpms at tummy.com as well.
 diff -urN Python-2.7.org/README Python-2.7/README
 --- Python-2.7.org/README	2010-07-03 15:56:13.000000000 +0200
 +++ Python-2.7/README	2010-07-05 20:00:03.586197142 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/0b87845d2efe8ebe0ef522e2eb815dfe6d24901e



More information about the pld-cvs-commit mailing list