packages: python/python-lib64.patch, python/python-verbose.patch, python/py...
arekm
arekm at pld-linux.org
Tue Nov 30 12:10:35 CET 2010
Author: arekm Date: Tue Nov 30 11:10:35 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.7.1
---- Files affected:
packages/python:
python-lib64.patch (1.20 -> 1.21) , python-verbose.patch (1.1 -> 1.2) , python.spec (1.379 -> 1.380)
---- Diffs:
================================================================
Index: packages/python/python-lib64.patch
diff -u packages/python/python-lib64.patch:1.20 packages/python/python-lib64.patch:1.21
--- packages/python/python-lib64.patch:1.20 Tue Jul 6 08:43:42 2010
+++ packages/python/python-lib64.patch Tue Nov 30 12:10:29 2010
@@ -308,22 +308,22 @@
self.assertEqual(len(dirs), 1)
- wanted = os.path.join('xoxo', 'Lib', 'site-packages')
+ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
- self.assertEquals(dirs[0], wanted)
+ self.assertEqual(dirs[0], wanted)
elif os.sep == '/':
- self.assertTrue(len(dirs), 2)
+ self.assertEqual(len(dirs), 2)
- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
'site-packages')
- self.assertEquals(dirs[0], wanted)
+ self.assertEqual(dirs[0], wanted)
- wanted = os.path.join('xoxo', 'lib', 'site-python')
+ wanted = os.path.join('xoxo', sys.lib, 'site-python')
- self.assertEquals(dirs[1], wanted)
+ self.assertEqual(dirs[1], wanted)
else:
- self.assertTrue(len(dirs), 2)
- self.assertEquals(dirs[0], 'xoxo')
+ self.assertEqual(len(dirs), 2)
+ self.assertEqual(dirs[0], 'xoxo')
- wanted = os.path.join('xoxo', 'lib', 'site-packages')
+ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
- self.assertEquals(dirs[1], wanted)
+ self.assertEqual(dirs[1], wanted)
# let's try the specific Apple location
--- Python-2.7/Lib/sysconfig.py.org 2010-05-20 00:20:14.000000000 +0200
================================================================
Index: packages/python/python-verbose.patch
diff -u packages/python/python-verbose.patch:1.1 packages/python/python-verbose.patch:1.2
--- packages/python/python-verbose.patch:1.1 Wed Jul 7 21:30:44 2010
+++ packages/python/python-verbose.patch Tue Nov 30 12:10:29 2010
@@ -4,10 +4,11 @@
# Build the shared modules
sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \
-- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -vvv build;; \
-+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -vvv build;; \
+- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -vvv build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -vvv build;; \
esac
# Build static library
+
================================================================
Index: packages/python/python.spec
diff -u packages/python/python.spec:1.379 packages/python/python.spec:1.380
--- packages/python/python.spec:1.379 Tue Sep 28 21:46:23 2010
+++ packages/python/python.spec Tue Nov 30 12:10:29 2010
@@ -43,15 +43,15 @@
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}
-Release: 4
+Version: %{py_ver}.1
+Release: 1
Epoch: 1
License: PSF
Group: Development/Languages/Python
Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
-# Source0-md5: 0e8c9ec32abf5b732bea7d91b38c3339
+# Source0-md5: aa27bc25725137ba155910bd8e5ddc4f
Source1: http://www.python.org/ftp/python/doc/%{dver}/%{name}-%{dver}-docs-html.tar.bz2
-# Source1-md5: 16b736789e923bbefe74e7a2219031c6
+# Source1-md5: 312d4da0c1d8adbfb27f4f0e09f2cffe
Patch0: %{name}-db.patch
Patch1: %{name}-pythonpath.patch
Patch2: %{name}-ac_fixes.patch
@@ -766,7 +766,6 @@
%attr(755,root,root) %{py_dyndir}/_socket.so
%attr(755,root,root) %{py_dyndir}/_ssl.so
%attr(755,root,root) %{py_dyndir}/_testcapi.so
-%attr(755,root,root) %{py_dyndir}/_weakref.so
%ifnarch sparc64
%attr(755,root,root) %{py_dyndir}/dbm.so
%endif
@@ -1026,6 +1025,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.380 2010/11/30 11:10:29 arekm
+- up to 2.7.1
+
Revision 1.379 2010/09/28 19:46:23 arekm
- rel 4; force posix semaphores as our builders don't always have shm enabled.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-lib64.patch?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-verbose.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python.spec?r1=1.379&r2=1.380&f=u
More information about the pld-cvs-commit
mailing list