[Erp5-report] r15516 - /spec/mandriva/2007.1/python2.4/python2.4.spec

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Aug  7 09:46:57 2007
New Revision: 15516

URL: http://svn.erp5.org?rev=15516&view=rev
Log:
* Tue Jul 31 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.3-4.2mdv2007.1
- rename binaries in tkinter2.4 package to avoid conflicts with tkinter
  package

Modified:
    spec/mandriva/2007.1/python2.4/python2.4.spec

Modified: spec/mandriva/2007.1/python2.4/python2.4.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4/python2.4.spec?rev=15516&r1=15515&r2=15516&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4/python2.4.spec (original)
+++ spec/mandriva/2007.1/python2.4/python2.4.spec Tue Aug  7 09:46:57 2007
@@ -8,7 +8,7 @@
 Summary:	An interpreted, interactive object-oriented programming language
 Name:		python%{lib_major}
 Version:	2.4.3
-Release:	%mkrel 4.1
+Release:	%mkrel 4.2
 License:	Modified CNRI Open Source License
 Group:		Development/Python
 
@@ -44,9 +44,7 @@
 Requires:	%{name}-base = %{version}
 Provides:	python = %{version}
 BuildRequires:	XFree86-devel 
-BuildRequires:	blt
-BuildRequires:	db2-devel, db4-devel
-BuildRequires:	emacs-bin
+BuildRequires:	db4-devel
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel 
 BuildRequires:	gmp-devel
@@ -56,7 +54,6 @@
 BuildRequires:	termcap-devel
 BuildRequires:	tcl tcl-devel
 BuildRequires:	tk tk-devel
-BuildRequires:	tcl tk tix
 BuildRequires:	tix
 BuildRequires:	autoconf2.5
 BuildRequires:  bzip2-devel
@@ -225,6 +222,7 @@
 
 # idle
 cp Tools/scripts/idle $RPM_BUILD_ROOT%{_bindir}/idle
+perl -pi -e "s,/usr/bin/env python$,/usr/bin/env python2.4," $RPM_BUILD_ROOT%{_bindir}/idle
 
 # modulator
 cat << EOF > $RPM_BUILD_ROOT%{_bindir}/modulator
@@ -242,6 +240,9 @@
 cp -r Tools/pynche $RPM_BUILD_ROOT%{_libdir}/python%{dirver}/site-packages/
 
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/{idle,modulator,pynche}
+mv $RPM_BUILD_ROOT%{_bindir}/idle $RPM_BUILD_ROOT%{_bindir}/idle2.4
+mv $RPM_BUILD_ROOT%{_bindir}/modulator $RPM_BUILD_ROOT%{_bindir}/modulator2.4
+mv $RPM_BUILD_ROOT%{_bindir}/pynche $RPM_BUILD_ROOT%{_bindir}/pynche2.4
 
 ln -f Tools/modulator/README Tools/modulator/README.modulator
 ln -f Tools/pynche/README Tools/pynche/README.pynche
@@ -258,12 +259,12 @@
 
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-tkinter.desktop << EOF
+cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-tkinter2.4.desktop << EOF
 [Desktop Entry]
 Encoding=UTF-8
 Name=IDLE
 Comment=IDE for Python
-Exec=%{_bindir}/idle
+Exec=%{_bindir}/idle2.4
 Icon=development_environment_section
 Terminal=false
 Type=Application
@@ -401,10 +402,10 @@
 %{_libdir}/python*/idlelib
 %{_libdir}/python*/site-packages/modulator
 %{_libdir}/python*/site-packages/pynche
-%{_bindir}/idle
-%{_bindir}/pynche
-%{_bindir}/modulator
-%{_datadir}/applications/mandriva-tkinter.desktop
+%{_bindir}/idle2.4
+%{_bindir}/pynche2.4
+%{_bindir}/modulator2.4
+%{_datadir}/applications/mandriva-tkinter2.4.desktop
 
 %files base -f include.list
 %defattr(-, root, root, 755)
@@ -421,6 +422,10 @@
 %clean_menus
 
 %changelog
+* Tue Jul 31 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.3-4.2mdv2007.1
+- rename binaries in tkinter2.4 package to avoid conflicts with tkinter
+  package
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.3-4.1mdv2007.1
 - python2.4 provides python and python2.4-base provides python-base