diff --git a/.cvsignore b/.cvsignore index 91a375f..a311fee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,2 @@ -JapaneseCodecs-1.4.10.tar.gz -Python-2.4b2.tar.bz2 -Python-2.4c1.tar.bz2 -Python-2.4.tar.bz2 +Python-2.4.1.tar.bz2 +JapaneseCodecs-1.4.11.tar.gz diff --git a/python.spec b/python.spec index bf53679..99bb036 100644 --- a/python.spec +++ b/python.spec @@ -12,14 +12,14 @@ %endif %define pybasever 2.4 -%define jp_codecs 1.4.10 +%define jp_codecs 1.4.11 %define tools_dir %{_libdir}/python%{pybasever}/Tools %define demo_dir %{_libdir}/python%{pybasever}/Demo Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} -Version: %{pybasever} -Release: 6 +Version: %{pybasever}.1 +Release: 1 License: PSF - see LICENSE Group: Development/Languages Provides: python-abi = %{pybasever} @@ -34,15 +34,13 @@ Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c Source7: python-2.3.4-optik.py -Patch0: python-2.4-config.patch -Patch1: python-2.4-xmlfix.patch +Patch0: python-2.4.1-config.patch Patch3: Python-2.2.1-pydocnogui.patch Patch7: python-2.3.4-lib64-regex.patch -Patch8: python-2.4-lib64.patch +Patch8: python-2.4.1-lib64.patch Patch9: japanese-codecs-lib64.patch Patch13: python-2.4-distutils-bdist-rpm.patch Patch14: python-2.3.4-pydocnodoc.patch -Patch16: python-2.4-db43.patch %if %{main_python} Obsoletes: Distutils @@ -138,7 +136,6 @@ user interface for Python programming. %setup -q -n Python-%{version} -a 5 %patch0 -p1 -b .rhconfig -%patch1 -p0 -b .xmlfix %patch3 -p1 -b .no_gui %if %{_lib} == lib64 %patch7 -p1 -b .lib64-regex @@ -147,7 +144,6 @@ user interface for Python programming. %endif %patch13 -p1 -b .bdist-rpm %patch14 -p1 -b .no-doc -%patch16 -p1 -b .db43 # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -342,6 +338,9 @@ rm -fr $RPM_BUILD_ROOT %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so %changelog +* Wed Apr 6 2005 Mihai Ibanescu 2.4.1-1 +- updated to 2.4.1 + * Mon Mar 14 2005 Mihai Ibanescu 2.4-6 - building the docs from a different source rpm, to decouple bootstrapping python from having tetex installed diff --git a/sources b/sources index 0a58d45..80655f8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d6a211e2fe98e2f8c57a5f27684048fd JapaneseCodecs-1.4.10.tar.gz -44c2226eff0f3fc1f2fedaa1ce596533 Python-2.4.tar.bz2 +de3e9a8836fab6df7c7ce545331afeb3 Python-2.4.1.tar.bz2 +e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz