SPECS: python.spec - no conflicts with 2.x

[arekm]

Author: arekm                        Date: Sun Sep  2 19:18:17 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no conflicts with 2.x

---- Files affected:
SPECS:
   python.spec (1.304 -> 1.305) 

---- Diffs:

================================================================
Index: SPECS/python.spec
diff -u SPECS/python.spec:1.304 SPECS/python.spec:1.305
--- SPECS/python.spec:1.304	Sun Aug 26 01:53:38 2007
+++ SPECS/python.spec	Sun Sep  2 21:18:12 2007
@@ -253,27 +253,25 @@
 %description modules-sqlite -l pl.UTF-8
 Oficjalnie rozprowadzany moduł sqlite języka Python.
 
-%package -n pydoc
+%package -n pydoc30
 Summary:	Python interactive module documentation access support
 Summary(pl.UTF-8):	Interaktywne korzystanie z dokumentacji modułów języka Python
 Group:		Applications
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-Obsoletes:	python-pydoc
 
-%description -n pydoc
+%description -n pydoc30
 Python interactive module documentation access support.
 
-%description -n pydoc -l pl.UTF-8
+%description -n pydoc30 -l pl.UTF-8
 Interaktywne korzystanie z dokumentacji modułów języka Python.
 
-%package -n idle
+%package -n idle30
 Summary:	IDE for Python language
 Summary(pl.UTF-8):	IDE dla języka Python
 Group:		Applications
 Requires:	%{name}-tkinter = %{epoch}:%{version}-%{release}
-Obsoletes:	python-idle
 
-%description -n idle
+%description -n idle30
 IDE for Python language.
 
 %description -n idle -l pl.UTF-8
@@ -581,8 +579,6 @@
 ln -sf libpython%{py_ver}.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libpython.so
 ln -sf libpython%{py_ver}.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libpython%{py_ver}.so
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/python%{py_ver}
-
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a Tools Demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -592,31 +588,36 @@
 
 # for python devel tools
 for script in timeit profile pdb pstats; do
-    echo alias $script.py=\"python -m ${script}\"
-done > $RPM_BUILD_ROOT/etc/shrc.d/python-devel.sh
+    echo alias ${script}%{py_ver}.py=\"python%{py_ver} -m ${script}\"
+done > $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-devel.sh
 
-echo alias pygettext.py='"pygettext"' \
-	>> $RPM_BUILD_ROOT/etc/shrc.d/python-devel.sh
+echo alias pygettext%{py_ver}.py='"pygettext%{py_ver}"' \
+	>> $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-devel.sh
 
 sed 's/=/ /' \
-	< $RPM_BUILD_ROOT/etc/shrc.d/python-devel.sh \
-	> $RPM_BUILD_ROOT/etc/shrc.d/python-devel.csh
+	< $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-devel.sh \
+	> $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-devel.csh
 
 # for python modules
 for script in smtpd webbrowser; do
-    echo alias $script.py=\"python -m ${script}\"
-done > $RPM_BUILD_ROOT/etc/shrc.d/python-modules.sh
+    echo alias ${script}%{py_ver}.py=\"python%{py_ver} -m ${script}\"
+done > $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-modules.sh
 
 sed 's/=/ /' \
-	< $RPM_BUILD_ROOT/etc/shrc.d/python-modules.sh \
-	> $RPM_BUILD_ROOT/etc/shrc.d/python-modules.csh
+	< $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-modules.sh \
+	> $RPM_BUILD_ROOT/etc/shrc.d/python%{py_ver}-modules.csh
 
 # xgettext specific for Python code
 #
 # we will have two commands: pygettext.py (an alias) and pygettext;
 # this way there are no import (which is impossible now) conflicts and
 # pygettext.py is provided for compatibility
-install Tools/i18n/pygettext.py $RPM_BUILD_ROOT%{_bindir}/pygettext
+install Tools/i18n/pygettext.py $RPM_BUILD_ROOT%{_bindir}/pygettext%{py_ver}
+
+# add py_ver
+for script in idle pydoc; do
+	mv $RPM_BUILD_ROOT%{_bindir}/${script} $RPM_BUILD_ROOT%{_bindir}/${script}%{py_ver}
+done
 
 # just to cut the noise, as they are not packaged (now)
 # first tests
@@ -828,14 +829,14 @@
 %dir %{py_scriptdir}/encodings
 %{py_scriptdir}/encodings/*.py[co]
 
-%files -n pydoc
+%files -n pydoc30
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pydoc
 %{py_scriptdir}/pydoc.py[co]
 
-%files -n idle
+%files -n idle30
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/idle
+%attr(755,root,root) %{_bindir}/idle%{py_ver}
 %dir %{py_scriptdir}/idlelib
 %dir %{py_scriptdir}/idlelib/Icons
 %{py_scriptdir}/idlelib/*.py[co]
@@ -893,7 +894,7 @@
 %doc Lib/pdb.doc
 /etc/shrc.d/python-devel*
 
-%attr(755,root,root) %{_bindir}/pygettext
+%attr(755,root,root) %{_bindir}/pygettext%{py_ver}
 
 %attr(755,root,root) %{py_dyndir}/_hotshot.so
 %dir %{py_scriptdir}/hotshot
@@ -935,6 +936,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.305  2007/09/02 19:18:12  arekm
+- no conflicts with 2.x
+
 Revision 1.304  2007/08/25 23:53:38  qboosh
 - include python-config symlink
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python.spec?r1=1.304&r2=1.305&f=u