SPECS (PYTHON_2_5): python.spec - updated files and kill more nois...

wrobell wrobell at pld-linux.org
Thu Aug 24 13:28:14 CEST 2006


Author: wrobell                      Date: Thu Aug 24 11:28:14 2006 GMT
Module: SPECS                         Tag: PYTHON_2_5
---- Log message:
- updated files and kill more noise from unpackaged files
- use aliases instead of scripts - /usr/bin/ no longer contains *.py, there
  should be no conflict imports anymore
- distinguish also between devel tools (pdb.py, timeit.py...)
  and python modules (smtpd.py, webbrowser.py...) aliases by creating
  python-devel* and python-modules* in /etc/shrc.d

---- Files affected:
SPECS:
   python.spec (1.263.2.4 -> 1.263.2.5) 

---- Diffs:

================================================================
Index: SPECS/python.spec
diff -u SPECS/python.spec:1.263.2.4 SPECS/python.spec:1.263.2.5
--- SPECS/python.spec:1.263.2.4	Mon Aug 21 20:38:37 2006
+++ SPECS/python.spec	Thu Aug 24 13:28:08 2006
@@ -214,6 +214,7 @@
 Summary(pl):	Moduły języka Python
 Group:		Libraries/Python
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:	python-ctypes
 Obsoletes:	python-logging
 Obsoletes:	python-old
 Obsoletes:	python-optik
@@ -464,23 +465,6 @@
 %description tkinter -l uk
 çŇÁĆŚŢÎÉĘ ŚÎÔĹŇĆĹĘÓ (GUI) ÄĚŃ Python, ĐĎÂŐÄĎ×ÁÎÉĘ ÎÁ Tcl/Tk.
 
-%package old
-Summary:	Deprecated Python modules
-Summary(pl):	Nieaktualne moduły języka Python
-Group:		Libraries/Python
-Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-
-%description old
-Install this package when one of your program written in Python is old
-as Miss Universum of 1918, who only you want to see... ooops, which
-only you want to run.
-
-%description old -l pl
-Zainstaluj ten pakiet, wtedy kiedy jeden z Twoich programów napisanych
-w języku Python jest tak stary jak Miss Universum z roku 1918, którą
-tylko ty chcesz zobaczyć... przepraszam, który tylko ty chcesz
-uruchomić.
-
 %package examples
 Summary:	Example programs in Python
 Summary(pl):	Przykładowe programy w Pythonie
@@ -538,7 +522,8 @@
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}} \
 	$RPM_BUILD_ROOT{%{py_sitedir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
-	$RPM_BUILD_ROOT%{_infodir}
+	$RPM_BUILD_ROOT%{_infodir} \
+	$RPM_BUILD_ROOT/etc/shrc.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -560,23 +545,53 @@
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -ar Tools Demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-SCRIPT_EXT=".py"
-export SCRIPT_EXT
+#
+# create several useful aliases, such as timeit.py, profile.py, pdb.py, smtpd.py
+#
 
-# create several useful scripts, such as timeit.py, profile.py, pdb.py, smtpd.py
-for script in timeit profile pdb pstats smtpd; do
-    cat <<END > $RPM_BUILD_ROOT%{_bindir}/${script}$SCRIPT_EXT
-#!/bin/sh
-exec %{_bindir}/python %{py_scriptdir}/${script}.pyc \${1:+"\$@"}
-END
-done
+# 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 pygettext.py='"pygettext"' \
+	>> $RPM_BUILD_ROOT/etc/shrc.d/python-devel.sh
+
+sed 's/=/ /' \
+	< $RPM_BUILD_ROOT/etc/shrc.d/python-devel.sh \
+	> $RPM_BUILD_ROOT/etc/shrc.d/python-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
+
+sed 's/=/ /' \
+	< $RPM_BUILD_ROOT/etc/shrc.d/python-modules.sh \
+	> $RPM_BUILD_ROOT/etc/shrc.d/python-modules.csh
 
 # xgettext specific for Python code
-install Tools/i18n/pygettext.py $RPM_BUILD_ROOT%{_bindir}/pygettext$SCRIPT_EXT
+#
+# 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
 
 # just to cut the noise, as they are not packaged (now)
+# first tests
 rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/test
-rm -f $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/bsddb/test
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/email/test
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
+
+# other files
+rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
+find $RPM_BUILD_ROOT%{py_scriptdir} -name \*.egg-info -exec rm {} \;
+find $RPM_BUILD_ROOT%{py_scriptdir} -name \*.bat -exec rm {} \;
+find $RPM_BUILD_ROOT%{py_scriptdir} -name \*.txt -exec rm {} \;
+find $RPM_BUILD_ROOT%{py_scriptdir} -name README\* -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -597,6 +612,7 @@
 
 %files modules
 %defattr(644,root,root,755)
+/etc/shrc.d/python-modules*
 %exclude %{py_scriptdir}/UserDict.py[co]
 %exclude %{py_scriptdir}/codecs.py[co]
 %exclude %{py_scriptdir}/copy_reg.py[co]
@@ -630,42 +646,40 @@
 %attr(755,root,root) %{py_dyndir}/dl.so
 %endif
 
+%attr(755,root,root) %{py_dyndir}/array.so
+%attr(755,root,root) %{py_dyndir}/binascii.so
 %attr(755,root,root) %{py_dyndir}/_bisect.so
 %attr(755,root,root) %{py_dyndir}/_bsddb.so
+%attr(755,root,root) %{py_dyndir}/bz2.so
+%attr(755,root,root) %{py_dyndir}/cmath.so
 %attr(755,root,root) %{py_dyndir}/_codecs_cn.so
 %attr(755,root,root) %{py_dyndir}/_codecs_hk.so
 %attr(755,root,root) %{py_dyndir}/_codecs_iso2022.so
 %attr(755,root,root) %{py_dyndir}/_codecs_jp.so
 %attr(755,root,root) %{py_dyndir}/_codecs_kr.so
 %attr(755,root,root) %{py_dyndir}/_codecs_tw.so
-%attr(755,root,root) %{py_dyndir}/_ctypes.so
+%attr(755,root,root) %{py_dyndir}/collections.so
+%attr(755,root,root) %{py_dyndir}/cPickle.so
+%attr(755,root,root) %{py_dyndir}/crypt.so
+%attr(755,root,root) %{py_dyndir}/cStringIO.so
 %attr(755,root,root) %{py_dyndir}/_csv.so
-%attr(755,root,root) %{py_dyndir}/_curses.so
+%attr(755,root,root) %{py_dyndir}/_ctypes.so
 %attr(755,root,root) %{py_dyndir}/_curses_panel.so
+%attr(755,root,root) %{py_dyndir}/_curses.so
+%attr(755,root,root) %{py_dyndir}/datetime.so
 %attr(755,root,root) %{py_dyndir}/_elementtree.so
 %attr(755,root,root) %{py_dyndir}/_functools.so
 %attr(755,root,root) %{py_dyndir}/_hashlib.so
 %attr(755,root,root) %{py_dyndir}/_heapq.so
 %attr(755,root,root) %{py_dyndir}/_locale.so
 %attr(755,root,root) %{py_dyndir}/_lsprof.so
-%attr(755,root,root) %{py_dyndir}/_sqlite3.so
 %attr(755,root,root) %{py_dyndir}/_multibytecodec.so
 %attr(755,root,root) %{py_dyndir}/_random.so
-%attr(755,root,root) %{py_dyndir}/_sha256.so
-%attr(755,root,root) %{py_dyndir}/_sha512.so
 %attr(755,root,root) %{py_dyndir}/_socket.so
+%attr(755,root,root) %{py_dyndir}/_sqlite3.so
 %attr(755,root,root) %{py_dyndir}/_ssl.so
 %attr(755,root,root) %{py_dyndir}/_testcapi.so
 %attr(755,root,root) %{py_dyndir}/_weakref.so
-%attr(755,root,root) %{py_dyndir}/array.so
-%attr(755,root,root) %{py_dyndir}/binascii.so
-%attr(755,root,root) %{py_dyndir}/bz2.so
-%attr(755,root,root) %{py_dyndir}/cPickle.so
-%attr(755,root,root) %{py_dyndir}/cStringIO.so
-%attr(755,root,root) %{py_dyndir}/cmath.so
-%attr(755,root,root) %{py_dyndir}/collections.so
-%attr(755,root,root) %{py_dyndir}/crypt.so
-%attr(755,root,root) %{py_dyndir}/datetime.so
 %ifnarch sparc64
 %attr(755,root,root) %{py_dyndir}/dbm.so
 %endif
@@ -785,6 +799,7 @@
 %files devel
 %defattr(644,root,root,755)
 %doc Misc/{ACKS,NEWS,README}
+%attr(755,root,root) %{_bindir}/python%{py_ver}-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %dir %{py_incdir}
 %{py_incdir}/*.h
@@ -829,12 +844,9 @@
 %files devel-tools
 %defattr(644,root,root,755)
 %doc Lib/pdb.doc
-%attr(755,root,root) %{_bindir}/timeit*
-%attr(755,root,root) %{_bindir}/profile*
-%attr(755,root,root) %{_bindir}/pdb*
-%attr(755,root,root) %{_bindir}/pstats*
-%attr(755,root,root) %{_bindir}/pygettext*
-%attr(755,root,root) %{_bindir}/smtpd*
+/etc/shrc.d/python-devel*
+
+%attr(755,root,root) %{_bindir}/pygettext
 
 %attr(755,root,root) %{py_dyndir}/_hotshot.so
 %dir %{py_scriptdir}/hotshot
@@ -875,6 +887,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263.2.5  2006/08/24 11:28:08  wrobell
+- updated files and kill more noise from unpackaged files
+- use aliases instead of scripts - /usr/bin/ no longer contains *.py, there
+  should be no conflict imports anymore
+- distinguish also between devel tools (pdb.py, timeit.py...)
+  and python modules (smtpd.py, webbrowser.py...) aliases by creating
+  python-devel* and python-modules* in /etc/shrc.d
+
 Revision 1.263.2.4  2006/08/21 18:38:37  wrobell
 - ver. 2.5 rc1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/python.spec?r1=1.263.2.4&r2=1.263.2.5&f=u



More information about the pld-cvs-commit mailing list