From: Arkadiusz Miśkiewicz Date: Sun, 2 Sep 2007 19:18:25 +0000 (+0000) Subject: - no conflicts with 2.x X-Git-Tag: deadbranch-1.2.2~4 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython3.git;a=commitdiff_plain;h=24586eb0d73b0fed33b1d698cbd67a7376f4cbe5 - no conflicts with 2.x Changed files: python3.spec -> 1.4 --- diff --git a/python3.spec b/python3.spec index ac18852..ec52a09 100644 --- a/python3.spec +++ b/python3.spec @@ -1,6 +1,3 @@ -# TODO: -# - conflicts with python.spec -# - %files # Conditional build: %bcond_with info # info pages (requires emacs) @@ -230,28 +227,28 @@ Python officially distributed sqlite module. %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} -%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} -%description -n idle +%description -n idle30 IDE for Python language. -%description -n idle -l pl.UTF-8 +%description -n idle30 -l pl.UTF-8 IDE dla języka Python. %package devel @@ -266,6 +263,7 @@ Summary(tr.UTF-8): Python ile geliştirme yapmak için gerekli dosyalar Summary(uk.UTF-8): Бібліотеки та хедери для програмування на мові Python Group: Development/Languages/Python Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Obsoletes: python-devel %description devel The Python interpreter is relatively easy to extend with dynamically @@ -528,7 +526,7 @@ export LC_ALL binlibdir=`echo build/lib.*` %{__make} test \ TESTOPTS="%{test_flags} %{test_list}" \ - TESTPYTHON="LD_LIBRARY_PATH=`pwd` PYTHONHOME=`pwd` PYTHONPATH=`pwd`/Lib:$binlibdir ./python -tt" + TESTPYTHON="LD_LIBRARY_PATH=`pwd` PYTHONHOME=`pwd` PYTHONPATH=`pwd`/Lib:$binlibdir ./python%{py_ver} -tt" %endif %install @@ -554,8 +552,6 @@ ln -sf libpython%{py_ver}.a $RPM_BUILD_ROOT%{_libdir}/libpython.a 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} @@ -565,31 +561,37 @@ cp -a Tools Demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} # 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 +mv $RPM_BUILD_ROOT%{_mandir}/man1/python.1 $RPM_BUILD_ROOT%{_mandir}/man1/python%{py_ver}.1 # just to cut the noise, as they are not packaged (now) # first tests @@ -621,12 +623,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/python +#%attr(755,root,root) %{_bindir}/python +%attr(755,root,root) %{_bindir}/python%{py_ver} %{_mandir}/man1/* %files modules %defattr(644,root,root,755) -/etc/shrc.d/python-modules* +/etc/shrc.d/python*-modules* %exclude %{py_scriptdir}/UserDict.py[co] %exclude %{py_scriptdir}/codecs.py[co] %exclude %{py_scriptdir}/copy_reg.py[co] @@ -804,14 +807,14 @@ rm -rf $RPM_BUILD_ROOT %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 +%attr(755,root,root) %{_bindir}/pydoc%{py_ver} %{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] @@ -867,9 +870,9 @@ rm -rf $RPM_BUILD_ROOT %files devel-tools %defattr(644,root,root,755) %doc Lib/pdb.doc -/etc/shrc.d/python-devel* +/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 @@ -888,9 +891,9 @@ rm -rf $RPM_BUILD_ROOT %{_examplesdir}/%{name}-%{version} -%files doc -%defattr(644,root,root,755) -%doc Python-Docs-%{version}%{beta}/* +#%files doc +#%defattr(644,root,root,755) +#%doc Python-Docs-%{version}%{beta}/* %if %{with info} %files doc-info