included db46 headers

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@872 ec354946-7b23-47d6-9f5a-488ba84defc7

p/python24/python24-vl.spec

@@ -1,22 +1,25 @@
 # If you want to run test, add "--define '_run_test 1'" to rpm option
 %define run_test %{?_run_test:1}%{!?_run_test:0}
-%define with_doc %{?_without_doc:0}%{!?_without_doc:1}
+%define with_doc %{?_without_doc:1}%{!?_without_doc:0}
 %define unicode	 ucs4
 %define tcl_major 8.4
 %define tk_major 8.4
 %define tix_major 8.4
 %define pybasever 2.4
 %define python_lib %{_libdir}/python%{pybasever}
+## as python24
+Packager: owa
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python2.4 インタプリタ
 Name: python24
 Version: 2.4.6
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: PSF - see LICENSE
 Group: Development/Languages
 URL: http://www.python.org/2.4/
 Source0: Python-%{version}.tar.bz2
+Source1: db46_headers.tar.gz
 #Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 Source6: shmmodule.c
 # For TEST
@@ -35,6 +38,7 @@ Source18: http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TX
 Source19: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT
 Source20: http://www.unicode.org/Public/3.2-Update/NormalizationTest-3.2.0.txt
 
+
 #Patch0: python-2.4.6-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch4: Python-2.3.3-nowhatsnew.patch
@@ -60,15 +64,15 @@ Obsoletes: python-base
 Provides: Distutils
 Provides: python2.4
 
-BuildPrereq: db4-devel
-BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
-BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel, tetex-latex
-BuildPrereq: tk tix gcc-c++ glibc-devel
-BuildPrereq: xorg-x11-devel mesa-libGL-devel
-BuildPrereq: gzip tar /usr/bin/find pkgconfig bzip2-devel
-BuildPrereq: nkf
+BuildRequires: db4-devel
+BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
+BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel, tetex-latex
+BuildRequires: tk tix gcc-c++ glibc-devel
+BuildRequires: xorg-x11-devel mesa-libGL-devel
+BuildRequires: gzip tar /usr/bin/find pkgconfig bzip2-devel
+BuildRequires: nkf
 %if %{with_doc}
-BuildPrereq: latex2html
+BuildRequires: latex2html
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -137,7 +141,7 @@ Summary: A graphical user interface for the Python scripting language.
 Summary(ja): Python スクリプト言語のグラフィカルインターフェイス
 Group: Development/Languages
 Obsoletes: tkinter2
-BuildPrereq:  tcl, tk
+BuildRequires:  tcl, tk
 Requires: %{name} = %{version}
 Requires: tix
 
@@ -149,7 +153,8 @@ You should install the tkinter package if you'd like to use a graphical
 user interface for Python programming.
 
 %prep
-%setup -q -n Python-%{version}
+%setup -q -n Python-%{version} -a 1
+
 #%patch0 -p1 -b .Setup
 %patch3 -p1 -b .no_gui
 %patch4 -p1 -b .nowhatsnew
@@ -385,6 +390,12 @@ rm -fr $RPM_BUILD_ROOT
 %{python_lib}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Apr 20 2010 Shu KONNO <owa@bg.wakwak.com> python2.4-2.4.6-3
+- added db46_headers.tar.gz
+- update Setup.dist{32,64}.patch
+- changed default to '--without doc'
+- s/BuildPreReq/BuildRequires/
+
 * Thu May 07 2009 Shu KONNO <owa@bg.wakwak.com> python2.4-2.4.6-2vl5
 - added python-2.4.6-{Setup,Setup64,lib64}.patch
   - added _bsddb module

p/python25/python25-vl.spec

@@ -7,16 +7,19 @@
 %define tix_major 8.4
 %define pybasever 2.5
 %define python_lib %{_libdir}/python%{pybasever}
+## as python25
+Packager: owa
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python25
 Version: %{pybasever}.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: PSF - see LICENSE
 Group: Development/Languages
 URL: http://www.python.org/%{pybasever}/
 Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
+Source1: db46_headers.tar.gz
 Source6: shmmodule.c
 # For TEST
 Source7: http://people.freebsd.org/~perky/i18n/EUC-CN.TXT
@@ -59,15 +62,15 @@ Obsoletes: Distutils
 Obsoletes: python-base
 Provides: Distutils
 
-BuildPrereq: db4-devel
-BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
-BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel, tetex-latex
-BuildPrereq: tk tix gcc-c++ glibc-devel
-BuildPrereq: xorg-x11-devel mesa-libGL-devel
-BuildPrereq: gzip tar /usr/bin/find pkgconfig bzip2-devel
-BuildPrereq: nkf
+BuildRequires: db4-devel
+BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
+BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel, tetex-latex
+BuildRequires: tk tix gcc-c++ glibc-devel
+BuildRequires: xorg-x11-devel mesa-libGL-devel
+BuildRequires: gzip tar /usr/bin/find pkgconfig bzip2-devel
+BuildRequires: nkf
 %if %{with_doc}
-BuildPrereq: latex2html
+BuildRequires: latex2html
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -149,7 +152,7 @@ You should install the tkinter package if you'd like to use a graphical
 user interface for Python programming.
 
 %prep
-%setup -q -n Python-%{version}
+%setup -q -n Python-%{version} -a 1
 %patch3 -p1 -b .no_gui
 %patch4 -p1 -b .nowhatsnew
 %patch5 -p1
@@ -400,6 +403,11 @@ rm -fr $RPM_BUILD_ROOT
 %{python_lib}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Apr 20 2010 Shu KONNO <owa@bg.wakwak.com> 2.5.5-2
+- added db46_headers.tar.gz
+- update Setup.dist{32,64}.patch
+- s/BuildPreReq/BuildRequires/
+
 * Mon Feb 01 2010 Shu KONNO <owa@bg.wakwak.com> 2.5.5-1
 - forked python to python25
 - renamed tkinter to python25-tkinter