SPECS (AC-branch): python.spec - Release 3. Use .sh extensions for...

matkor matkor at pld-linux.org
Mon Jul 9 14:02:55 CEST 2007


Author: matkor                       Date: Mon Jul  9 12:02:55 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- Release 3. Use .sh extensions for /usr/bin scrips to prevent import clash.

---- Files affected:
SPECS:
   python.spec (1.263.4.12 -> 1.263.4.13) 

---- Diffs:

================================================================
Index: SPECS/python.spec
diff -u SPECS/python.spec:1.263.4.12 SPECS/python.spec:1.263.4.13
--- SPECS/python.spec:1.263.4.12	Wed Apr  4 10:18:17 2007
+++ SPECS/python.spec	Mon Jul  9 14:02:50 2007
@@ -36,7 +36,7 @@
 Summary(uk):	íÏ×Á ÐÒÏÇÒÁÍÕ×ÁÎÎÑ ÄÕÖÅ ×ÉÓÏËÏÇÏ Ò¦×ÎÑ Ú X-¦ÎÔÅÒÆÅÊÓÏÍ
 Name:		python
 Version:	%{py_ver}.4
-Release:	2
+Release:	3
 Epoch:		1
 License:	PSF
 Group:		Applications
@@ -560,10 +560,14 @@
 cp -a Tools Demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install %{SOURCE2}  $RPM_BUILD_ROOT%{_bindir}/python-config
 
-SCRIPT_EXT=".py"
+# NOTE: Do *not* use .py extension for python programs in dirs where other python programs are present
+# This will make those programs import local programs instead of global modules
+# Example:  bzr sftp://foo/bar (importing pdb )
+SCRIPT_EXT=".sh"
 export SCRIPT_EXT
 
-# create several useful scripts, such as timeit.py, profile.py, pdb.py, smtpd.py
+# create several useful scripts, such as timeit.sh, profile.sh, pdb.sh, smtpd.sh
+
 for script in timeit profile pdb pstats smtpd; do
     cat <<END > $RPM_BUILD_ROOT%{_bindir}/${script}$SCRIPT_EXT
 #!/bin/sh
@@ -860,6 +864,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263.4.13  2007/07/09 12:02:50  matkor
+- Release 3. Use .sh extensions for /usr/bin scrips to prevent import clash.
+
 Revision 1.263.4.12  2007/04/04 08:18:17  jajcus
 - LICENSE file added to %doc
 
================================================================

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



More information about the pld-cvs-commit mailing list