packages: python3/python3.spec - 3.1.2 - rename 2to3 to avoid conflict with...

[wiget]

Author: wiget                        Date: Sat Mar 27 11:24:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.1.2
- rename 2to3 to avoid conflict with python-2.x version

---- Files affected:
packages/python3:
   python3.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/python3/python3.spec
diff -u packages/python3/python3.spec:1.33 packages/python3/python3.spec:1.34
--- packages/python3/python3.spec:1.33	Wed Mar  3 23:13:53 2010
+++ packages/python3/python3.spec	Sat Mar 27 12:24:10 2010
@@ -35,13 +35,13 @@
 Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python3
-Version:	%{py_ver}.1
-Release:	3
+Version:	%{py_ver}.2
+Release:	1
 Epoch:		1
 License:	PSF
 Group:		Applications
 Source0:	http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
-# Source0-md5:	d1ddd9f16e3c6a51c7208f33518cd674
+# Source0-md5:	45350b51b58a46b029fb06c61257e350
 Patch0:		%{name}-pythonpath.patch
 Patch1:		%{name}-ac_fixes.patch
 Patch2:		%{name}-lib64.patch
@@ -590,6 +590,9 @@
 # pygettext.py is provided for compatibility
 install Tools/i18n/pygettext.py $RPM_BUILD_ROOT%{_bindir}/pygettext%{py_ver}
 
+# rename file conflicting with python 2.*
+mv $RPM_BUILD_ROOT%{_bindir}/2to3{,-%{py_ver}}
+
 # just to cut the noise, as they are not packaged (now)
 # first tests
 rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/test
@@ -601,6 +604,7 @@
 rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/json/tests
 rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
 rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/importlib/test
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/tkinter/test
 
 # other files
 rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
@@ -921,7 +925,7 @@
 %{py_scriptdir}/timeit.py[co]
 
 %files 2to3
-%attr(755,root,root) %{_bindir}/2to3
+%attr(755,root,root) %{_bindir}/2to3-%{py_ver}
 %dir %{py_scriptdir}/lib2to3
 %{py_scriptdir}/lib2to3/*.txt
 %{py_scriptdir}/lib2to3/*.pickle
@@ -960,6 +964,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2010/03/27 11:24:10  wiget
+- 3.1.2
+- rename 2to3 to avoid conflict with python-2.x version
+
 Revision 1.33  2010/03/03 22:13:53  wiget
 - problem no longer exists?
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3.spec?r1=1.33&r2=1.34&f=u