--- a/ChangeLog	Thu Dec 17 09:05:54 2009 +0000
+++ b/ChangeLog	Thu Dec 17 09:08:23 2009 +0000
@@ -1,3 +1,8 @@
+2009-12-17  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWPython.spec: remove /usr/bin/python
+	* SUNWPython26.spec: add /usr/bin/python symlink, pointing to 2.6
+
 2009-12-17  Simon Jin  <[email protected]>
 
 	* SUNWgnome-im-client.spec:

--- a/SUNWPython.spec	Thu Dec 17 09:05:54 2009 +0000
+++ b/SUNWPython.spec	Thu Dec 17 09:08:23 2009 +0000
@@ -104,7 +104,6 @@
 Summary:                 %{summary} - development files
 %include default-depend.inc
 Requires: SUNWPython
-Requires: SUNWscpu
 
 %prep
 %setup -q -c -n %name-%version
@@ -274,16 +273,11 @@
 mv python2.4 %{base_isa}/isapython2.4
 ln -s %{base_isa}/isapython2.4 python2.4
 
-# /usr/bin/python back at 2.4 temporarily
-ln -s python2.4 python
-
 %ifarch amd64 sparcv9
 cd %{_arch64}
 mv python2.4 isapython2.4
 ln -s isapython2.4 python2.4
 rm python
-# /usr/bin/python back at 2.4 temporarily
-ln -s python2.4 python
 cd ..
 %endif
 
@@ -303,7 +297,6 @@
 %{_bindir}/idle
 %{_bindir}/pydoc
 %{_bindir}/python2.4
-%{_bindir}/python
 %{_bindir}/%{base_isa}/isapython2.4
 %hard %{_bindir}/isapython2.4
 %{_prefix}/demo/python/smtpd.py

--- a/SUNWPython26.spec	Thu Dec 17 09:05:54 2009 +0000
+++ b/SUNWPython26.spec	Thu Dec 17 09:08:23 2009 +0000
@@ -306,9 +306,8 @@
 rm python-config
 mv python%{majmin} isapython%{majmin}
 ln -s isapython%{majmin} python%{majmin}
-# back to 2.4 temporarily
-## this is the default python
-#ln -s python%{majmin} python
+# this is the default python
+ln -s python%{majmin} python
 # don't need a 64-bit version of this tool
 rm 2to3
 cd ..
@@ -317,9 +316,8 @@
 # this becomes a hard link in the pkgmap, due to %hard
 ln -s ../lib/isaexec isapython%{majmin}
 
-# back to 2.4 temporarily
-## this is the default python
-#ln -s python%{majmin} python
+# this is the default python
+ln -s python%{majmin} python
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
@@ -353,7 +351,7 @@
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/python%{majmin}
 %{_bindir}/python-config
-#%{_bindir}/python
+%{_bindir}/python
 # hard link to isaexec
 %hard %{_bindir}/isapython%{majmin}
 %dir %attr (0755, root, bin) %{_bindir}/%{base_isa}
@@ -390,7 +388,7 @@
 %{_libdir}/%{_arch64}/lib*.so*
 %dir %attr(0755, root, bin) %{_bindir}/%{_arch64}
 %{_bindir}/%{_arch64}/python%{majmin}
-#%{_bindir}/%{_arch64}/python
+%{_bindir}/%{_arch64}/python
 %{_bindir}/%{_arch64}/isapython%{majmin}
 %endif
 %dir %attr(0755, root, sys) %{_datadir}