[Erp5-report] r28735 - /spec/mandriva/python2.4/python2.4.spec
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 1 20:28:52 CEST 2009
Author: kazuhiko
Date: Tue Sep 1 20:28:52 2009
New Revision: 28735
URL: http://svn.erp5.org?rev=28735&view=rev
Log:
- update spec to build for 2009.1
- drop tarfile patch because we no longer need it.
Modified:
spec/mandriva/python2.4/python2.4.spec
Modified: spec/mandriva/python2.4/python2.4.spec
URL: http://svn.erp5.org/spec/mandriva/python2.4/python2.4.spec?rev=28735&r1=28734&r2=28735&view=diff
==============================================================================
--- spec/mandriva/python2.4/python2.4.spec [utf8] (original)
+++ spec/mandriva/python2.4/python2.4.spec [utf8] Tue Sep 1 20:28:52 2009
@@ -1,17 +1,18 @@
# python built with '-Wl,--as-needed' is 2-3% slower
%define _disable_ld_as_needed 1
-%define _disable_ld_no_undefined 1
%define docver 2.4.4
%define dirver 2.4
%define lib_major %{dirver}
%define lib_name_orig libpython
%define lib_name %mklibname python %{lib_major}
+%define _disable_ld_no_undefined 1
+%define _requires_exceptions python-base
Summary: An interpreted, interactive object-oriented programming language
Name: python2.4
Version: 2.4.6
-Release: %mkrel 1.1
+Release: %mkrel 1.2
License: Modified CNRI Open Source License
Group: Development/Python
@@ -30,7 +31,7 @@
# Do handle <asm-XXX/*.h> headers in h2py.py
# FIXME: incomplete for proper bi-arch support as #if/#else/#endif
# clauses generally should have been handled
-Patch5: Python-2.2.2-biarch-headers.patch.bz2
+Patch5: python-2.4.5-biarch-headers.patch
# detect and link with gdbm_compat for dbm module
Patch6: Python-2.4.1-gdbm.patch.bz2
@@ -39,15 +40,11 @@
Patch8: python-2.4.4-parallel.patch
Patch9: python-2.4.4-CVE-2007-2052.patch
Patch12: python-2.5-format-string.patch
-Patch100: Python-2.4.3-tarfile.py.patch
URL: http://www.python.org/
Conflicts: tkinter < %{version}
Requires: %{lib_name} = %{version}
Requires: %{name}-base = %{version}
-BuildRequires: XFree86-devel
-BuildRequires: blt
BuildRequires: db2-devel, db4-devel
-BuildRequires: emacs-bin
BuildRequires: expat-devel
BuildRequires: gdbm-devel
BuildRequires: gmp-devel
@@ -55,13 +52,16 @@
BuildRequires: openssl-devel
BuildRequires: readline-devel
BuildRequires: termcap-devel
+%if %mdkversion < 200910
+BuildRequires: XFree86-devel
+BuildRequires: blt
BuildRequires: tcl tcl-devel
BuildRequires: tk tk-devel
BuildRequires: tcl tk tix
BuildRequires: tix
+%endif
BuildRequires: autoconf2.5
BuildRequires: bzip2-devel
-Provides: python = %{version}-%{release}
Buildroot: %{_tmppath}/%{name}-%{version}
%description
@@ -97,7 +97,6 @@
Requires: %{lib_name} = %{version}
Obsoletes: %{name}-devel
Provides: %{name}-devel = %{version}-%{release}
-Provides: %{lib_name_orig}-devel = %{version}-%{release}
%description -n %{lib_name}-devel
The Python programming language's interpreter can be extended with
@@ -112,7 +111,7 @@
%package docs
Summary: Documentation for the Python programming language
-Requires: python = %version
+Requires: %{name} = %version
Group: Development/Python
%description docs
@@ -123,6 +122,7 @@
Install the python-docs package if you'd like to use the documentation
for the Python language.
+%if %mdkversion < 200910
%package -n tkinter2.4
Summary: A graphical user interface for the Python scripting language
Group: Development/Python
@@ -135,6 +135,7 @@
You should install the tkinter package if you'd like to use a graphical
user interface for Python programming.
+%endif
%package base
Summary: Python base files
@@ -162,8 +163,6 @@
# security fix CVE-2007-2052
%patch9 -p1
%patch12 -p0
-# fix a bug of tarfile
-%patch100 -p1
autoconf
@@ -235,20 +234,10 @@
# the shared library could be found when -L/usr/lib/python*/config is specified
(cd %{buildroot}%{_libdir}/python%{dirver}/config; ln -sf ../../libpython%{lib_major}.so .)
-# emacs, I use it, I want it
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
-install -m 644 Misc/python-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/python2.4-mode.el
-emacs -batch -f batch-byte-compile %{buildroot}%{_datadir}/emacs/site-lisp/python2.4-mode.el
-
-install -d %{buildroot}%{_sysconfdir}/emacs/site-start.d
-cat <<EOF >%{buildroot}%{_sysconfdir}/emacs/site-start.d/%{name}.el
-(setq auto-mode-alist (cons '("\\\\.py$" . python-mode) auto-mode-alist))
-(autoload 'python-mode "python-mode" "Mode for python files." t)
-EOF
-
# smtpd proxy
mv -f %{buildroot}%{_bindir}/smtpd.py %{buildroot}%{_libdir}/python%{dirver}/
+%if %mdkversion < 200910
# modulator
cat << EOF > %{buildroot}%{_bindir}/modulator2.4
#!/bin/bash
@@ -268,6 +257,7 @@
ln -f Tools/modulator/README Tools/modulator/README.modulator
ln -f Tools/pynche/README Tools/pynche/README.pynche
+%endif
rm -f modules-list.full
for n in %{buildroot}%{_libdir}/python%{dirver}/*; do
@@ -281,6 +271,7 @@
mkdir -p %{buildroot}%{_datadir}/applications
+%if %mdkversion < 200910
cat > %{buildroot}%{_datadir}/applications/mandriva-tkinter2.4.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
@@ -292,7 +283,7 @@
Type=Application
Categories=X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments;Development;IDE;
EOF
-
+%endif
cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}-docs.desktop << EOF
[Desktop Entry]
@@ -324,7 +315,6 @@
%{_libdir}/python*/hotshot/
%{_libdir}/python*/site-packages/README
%{_libdir}/python*/plat-linux2/
-%{_datadir}/emacs/site-lisp/python2.4-mode.el*
EOF
LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/python2.4 %{SOURCE3} %{buildroot} include.list modules-list > main.list
@@ -382,6 +372,15 @@
%multiarch_includes %{buildroot}/usr/include/python*/pyconfig.h
+%if %mdkversion >= 200910
+# drop tkinter files
+rm -rf %{buildroot}%{_libdir}/python2.4/lib-tk
+rm -rf %{buildroot}%{_libdir}/python2.4/idlelib
+rm -rf %{buildroot}%{_libdir}/python2.4/site-packages/modulator
+rm -rf %{buildroot}%{_libdir}/python2.4/site-packages/pynche
+rm -f %{buildroot}%{_bindir}/idle2.4
+%endif
+
%clean
rm -rf %{buildroot}
rm -f modules-list main.list
@@ -391,7 +390,6 @@
%doc README.mdv
%dir %{_libdir}/python*/lib-dynload
%dir %{_libdir}/python*/site-packages
-%config(noreplace) %{_sysconfdir}/emacs/site-start.d/%{name}.el
%{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/python2.4rc.py
@@ -414,6 +412,7 @@
%doc html/*/*
%{_datadir}/applications/mandriva-%{name}-docs.desktop
+%if %mdkversion < 200910
%files -n tkinter2.4
%defattr(-,root,root)
%dir %{_libdir}/python*/lib-tk
@@ -426,6 +425,7 @@
%{_bindir}/pynche2.4
%{_bindir}/modulator2.4
%{_datadir}/applications/mandriva-tkinter2.4.desktop
+%endif
%files base -f include.list
%defattr(-,root,root)
@@ -450,6 +450,10 @@
%changelog
+* Wed Aug 19 2009 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.6-1.2nxd2009.1
+- update spec to build for 2009.1
+- drop tarfile patch because we no longer need it.
+
* Fri Mar 13 2009 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.6-1.1nxd2009.0
- set _disable_ld_as_needed as 1 for the better performance (2-3% faster).
More information about the Erp5-report
mailing list