Browse Source

updated: python to 2.6.5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@619 ec354946-7b23-47d6-9f5a-488ba84defc7
owa 12 years ago
parent
commit
5f3aefd9e1
1 changed files with 19 additions and 6 deletions
  1. 19 6
      p/python/python-vl.spec

+ 19 - 6
p/python/python-vl.spec

@@ -2,6 +2,7 @@
 %define run_test %{?_run_test:1}%{!?_run_test:0}
 %define with_doc %{?_without_doc:0}%{!?_without_doc:1}
 %define unicode	 ucs4
+%define bsddb_ver 4.8
 %define tcl_major 8.4
 %define tk_major 8.4
 %define tix_major 8.4
@@ -11,8 +12,8 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python
-Version: %{pybasever}.4
-Release: 5%{?_dist_release}
+Version: %{pybasever}.5
+Release: 1%{?_dist_release}
 License: PSF - see LICENSE
 Group: Development/Languages
 URL: http://www.python.org/%{pybasever}/
@@ -42,6 +43,7 @@ Patch3: Python-2.2.1-pydocnogui.patch
 Patch5: Python-2.3.3-distutilrpm.patch
 
 Patch10: python-2.6-db48.patch
+Patch11: http://bugs.python.org/file16549/python-support_bdb-4.8-v2.patch
 
 Obsoletes: python2 
 Obsoletes: Distutils
@@ -147,7 +149,9 @@ user interface for Python programming.
 %patch3 -p1 -b .no_gui
 %patch5 -p1 -b .distutilrpm
 
-%patch10 -p1 -b .db48
+## for bsddb-4.8
+# %patch10 -p1 -b .db48
+%patch11 -p0 -b .db48-v2
 
 
 # remove unneeded files
@@ -170,9 +174,12 @@ EOF
 # Fix library flags
 pushd Modules
 mv Setup.dist Setup.dist.in
-sed "s|-ltcl|-ltcl%{tcl_major}|" < Setup.dist.in |\
-sed "s|-ltk|-ltk%{tk_major}|" |\
-sed "s|-ltix|-ltix%{tix_major}|"  > Setup.dist
+cat Setup.dist.in | \
+	sed "s^-ldb-^-ldb-%{bsddb_ver}^"| \
+	sed "s^-ltcl^-ltcl%{tcl_major}^"| \
+	sed "s^-ltk^-ltk%{tk_major}^" | \
+	sed "s^-ltix^-ltix%{tix_major}^" \
+> Setup.dist
 rm -f Setup.dist.in
 popd
 
@@ -379,6 +386,12 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 20 2010 Shu KONNO <owa@bg.wakwak.com> 2.6.5-1
+- updated python to 2.6.5
+- updated Patch0: Python-2.6.4-Setup.dist.patch
+- added macro bsddb_ver
+- added Patch11: python-support_bdb-4.8-v2.patch (instead of Patch10: python-2.6-db48.patch)
+
 * Sat Mar 06 2010 Shu KONNO <owa@bg.wakwak.com> 2.6.4-5
 - added Python-2.6.4-Doc.78718.tgz (documents from http://svn.python.org/projects)
 - changed default to '--with doc' again