devel/python .cvsignore, 1.16, 1.17 python.spec, 1.106, 1.107 sources, 1.16, 1.17 python-2.5-distutils-bdist-rpm.patch, 1.1, NONE python-2.5-fix-invalid-assert.patch, 1.1, NONE python-ctypes-execstack.patch, 1.1, NONE python-db45.patch, 1.1, NONE python-syslog-fail-noatexittb.patch, 1.1, NONE

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27588

Modified Files:
	.cvsignore python.spec sources 
Removed Files:
	python-2.5-distutils-bdist-rpm.patch 
	python-2.5-fix-invalid-assert.patch 
	python-ctypes-execstack.patch python-db45.patch 
	python-syslog-fail-noatexittb.patch 
Log Message:
* Thu May 31 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-1
- update to python 2.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/python/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Dec 2006 21:34:32 -0000	1.16
+++ .cvsignore	31 May 2007 20:09:48 -0000	1.17
@@ -1 +1 @@
-Python-2.5.tar.bz2
+Python-2.5.1.tar.bz2


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- python.spec	10 Apr 2007 14:23:41 -0000	1.106
+++ python.spec	31 May 2007 20:09:48 -0000	1.107
@@ -19,9 +19,8 @@
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-#Version: %{pybasever}.3
-Version: 2.5
-Release: 12%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -30,16 +29,11 @@
 
 Patch0: python-2.5-config.patch
 Patch1: Python-2.2.1-pydocnogui.patch
-Patch2: python-2.5-distutils-bdist-rpm.patch
-Patch3: python-2.3.4-pydocnodoc.patch
-Patch4: python-2.4.1-canonicalize.patch
-Patch5: python-2.5-cflags.patch
-Patch6: python-db45.patch
-Patch7: python-ctypes-execstack.patch
+Patch2: python-2.3.4-pydocnodoc.patch
+Patch3: python-2.4.1-canonicalize.patch
+Patch4: python-2.5-cflags.patch
 
 # upstreamed
-Patch25: python-syslog-fail-noatexittb.patch
-Patch26: python-2.5-fix-invalid-assert.patch
 
 # disable egg-infos for now
 Patch50: python-2.5-disable-egginfo.patch
@@ -158,14 +152,9 @@
 
 %patch0 -p1 -b .rhconfig
 %patch1 -p1 -b .no_gui
-%patch2 -p1 -b .bdist-rpm
-%patch3 -p1 -b .no-doc
-%patch4 -p1 -b .canonicalize
-%patch5 -p1 -b .cflags
-%patch6 -p1 -b .db45
-%patch7 -p1 -b .ctypes-exec
-%patch25 -p1 -b .syslog-atexit
-%patch26 -p1 -b .invalid-assert
+%patch2 -p1 -b .no-doc
+%patch3 -p1 -b .canonicalize
+%patch4 -p1 -b .cflags
 
 %patch50 -p1 -b .egginfo
 
@@ -182,10 +171,6 @@
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
 
-# Temporary workaround to avoid confusing find-requires: don't ship the tests
-# as executable files
-chmod 0644 Lib/test/test_*.py
-
 %build
 topdir=`pwd`
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
@@ -229,6 +214,9 @@
         && cat $fixed- > $fixed && rm -f $fixed-
 done
 
+# don't include tests that are run at build time in the package
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pybasever}/test
+
 %if %{main_python}
 ln -s python $RPM_BUILD_ROOT%{_bindir}/python2
 %else
@@ -287,9 +275,6 @@
 #zero length
 rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright
 
-# Clean up the testsuite - we don't need compiled files for it
-find $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test \
-    -name "*.pyc" -o -name "*.pyo" | xargs rm -f
 rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/LICENSE.txt
 
 
@@ -396,7 +381,6 @@
 /usr/include/*
 %dir %{_libdir}/python%{pybasever}/config
 %{_libdir}/python%{pybasever}/config/*
-%{_libdir}/python%{pybasever}/test
 %{_libdir}/libpython%{pybasever}.so
 
 %files tools
@@ -421,6 +405,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Thu May 31 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-1
+- update to python 2.5.1
+
 * Mon Mar 19 2007 Jeremy Katz <katzj at redhat.com> - 2.5.3-12
 - fix alpha build (#231961)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/python/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Dec 2006 21:34:32 -0000	1.16
+++ sources	31 May 2007 20:09:48 -0000	1.17
@@ -1 +1 @@
-ddb7401e711354ca83b7842b733825a3  Python-2.5.tar.bz2
+70084ffa561660f07de466c2c8c4842d  Python-2.5.1.tar.bz2


--- python-2.5-distutils-bdist-rpm.patch DELETED ---


--- python-2.5-fix-invalid-assert.patch DELETED ---


--- python-ctypes-execstack.patch DELETED ---


--- python-db45.patch DELETED ---


--- python-syslog-fail-noatexittb.patch DELETED ---