packages: python/python-ac_fixes.patch, python/python.spec - rel 1

arekm arekm at pld-linux.org
Mon Jul 5 22:56:04 CEST 2010


Author: arekm                        Date: Mon Jul  5 20:56:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1

---- Files affected:
packages/python:
   python-ac_fixes.patch (1.6 -> 1.7) , python.spec (1.360 -> 1.361) 

---- Diffs:

================================================================
Index: packages/python/python-ac_fixes.patch
diff -u packages/python/python-ac_fixes.patch:1.6 packages/python/python-ac_fixes.patch:1.7
--- packages/python/python-ac_fixes.patch:1.6	Mon Jul  5 20:41:39 2010
+++ packages/python/python-ac_fixes.patch	Mon Jul  5 22:55:58 2010
@@ -20,6 +20,15 @@
  	case $ac_sys_system in
 --- Python-2.7/Makefile.pre.in~	2010-04-12 02:10:46.000000000 +0200
 +++ Python-2.7/Makefile.pre.in	2010-07-05 20:04:00.942224202 +0200
+@@ -831,7 +831,7 @@
+ 		fi; \
+ 	done
+ 	$(INSTALL_DATA) $(srcdir)/Misc/python.man \
+-		$(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
++		$(DESTDIR)$(MANDIR)/man1/python.1
+ 
+ # Install the library
+ PLATDIR=	plat-$(MACHDEP)
 @@ -953,7 +953,7 @@
  python-config: $(srcdir)/Misc/python-config.in
  	# Substitution happens here, as the completely-expanded BINDIR
@@ -29,4 +38,3 @@
  
  # Install the include files
  INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-

================================================================
Index: packages/python/python.spec
diff -u packages/python/python.spec:1.360 packages/python/python.spec:1.361
--- packages/python/python.spec:1.360	Mon Jul  5 20:41:39 2010
+++ packages/python/python.spec	Mon Jul  5 22:55:58 2010
@@ -45,7 +45,7 @@
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python
 Version:	%{py_ver}
-Release:	0.1
+Release:	1
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
@@ -552,6 +552,8 @@
 
 tar xjf %{SOURCE1}
 
+sed -i -e 's#db_setup_debug = False#db_setup_debug = True#g' setup.py
+
 %build
 sed -i -e 's#-ltermcap#-ltinfo#g' configure*
 %{__autoconf}
@@ -563,7 +565,7 @@
 	--enable-ipv6 \
 	--enable-unicode=ucs4 \
 	--enable-shared \
-	--with-dbmliborder=gdbm \
+	--with-dbmliborder=gdbm:bdb \
 	LINKCC='$(PURIFY) $(CXX)' \
 	LDSHARED='$(CC) $(CFLAGS) -shared' \
 	BLDSHARED='$(CC) $(CFLAGS) -shared' \
@@ -719,7 +721,6 @@
 %attr(755,root,root) %{py_dyndir}/binascii.so
 %attr(755,root,root) %{py_dyndir}/_bisect.so
 %attr(755,root,root) %{py_dyndir}/_bsddb.so
-%attr(755,root,root) %{py_dyndir}/_bytesio.so
 %attr(755,root,root) %{py_dyndir}/bz2.so
 %attr(755,root,root) %{py_dyndir}/cmath.so
 %attr(755,root,root) %{py_dyndir}/_codecs_cn.so
@@ -739,9 +740,9 @@
 %attr(755,root,root) %{py_dyndir}/datetime.so
 %attr(755,root,root) %{py_dyndir}/_elementtree.so
 %attr(755,root,root) %{py_dyndir}/_functools.so
-%attr(755,root,root) %{py_dyndir}/_fileio.so
 %attr(755,root,root) %{py_dyndir}/_hashlib.so
 %attr(755,root,root) %{py_dyndir}/_heapq.so
+%attr(755,root,root) %{py_dyndir}/_io.so
 %attr(755,root,root) %{py_dyndir}/_json.so
 %attr(755,root,root) %{py_dyndir}/_locale.so
 %attr(755,root,root) %{py_dyndir}/_lsprof.so
@@ -807,6 +808,9 @@
 %{py_scriptdir}/email/*.py[co]
 %{py_scriptdir}/email/mime/*.py[co]
 
+%dir %{py_scriptdir}/importlib
+%{py_scriptdir}/importlib/*.py[co]
+
 %dir %{py_scriptdir}/json
 %{py_scriptdir}/json/*.py[co]
 
@@ -818,6 +822,11 @@
 %{py_scriptdir}/multiprocessing/*.py[co]
 %{py_scriptdir}/multiprocessing/dummy/*.py[co]
 
+%dir %{py_scriptdir}/unittest
+%{py_scriptdir}/unittest/*.py[co]
+%dir %{py_scriptdir}/unittest/test
+%{py_scriptdir}/unittest/test/*.py[co]
+
 %dir %{py_scriptdir}/wsgiref
 %{py_scriptdir}/wsgiref/*.py[co]
 
@@ -871,6 +880,8 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pydoc
 %{py_scriptdir}/pydoc.py[co]
+%dir %{py_scriptdir}/pydoc_data
+%{py_scriptdir}/pydoc_data/*.py[co]
 
 %files -n idle
 %defattr(644,root,root,755)
@@ -889,6 +900,7 @@
 %attr(755,root,root) %{_libdir}/lib*.so
 %dir %{py_incdir}
 %{py_incdir}/*.h
+%{_pkgconfigdir}/*.pc
 
 %dir %{py_libdir}/config
 %attr(755,root,root) %{py_libdir}/config/makesetup
@@ -989,6 +1001,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.361  2010/07/05 20:55:58  arekm
+- rel 1
+
 Revision 1.360  2010/07/05 18:41:39  arekm
 - update to 2.7 (builds but fails on files; still some small fixes and testing is needed)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-ac_fixes.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python.spec?r1=1.360&r2=1.361&f=u



More information about the pld-cvs-commit mailing list