Browse Source

replaced: documen, patchs

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

+ 13 - 13
p/python/python-vl.spec

@@ -13,12 +13,12 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python
 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: Python-2.6.4-Doc.78718.tgz
+Source1: http://docs.python.org/archives/python-%{version}-docs-html.tar.bz2
 Source6: shmmodule.c
 
 # For TEST
@@ -37,8 +37,8 @@ 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.6.4-Setup.dist.patch
-Patch1: python-2.6.3-lib64.patch
+Patch0: python-2.6.5-Setup.dist.patch
+Patch1: python-2.6.5-lib64.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch5: Python-2.3.3-distutilrpm.patch
 
@@ -141,7 +141,7 @@ You should install the tkinter package if you'd like to use a graphical
 user interface for Python programming.
 
 %prep
-%setup -q -a 1 -n Python-%{version}
+%setup -q -n Python-%{version}
 %patch0 -p1 -b .Setup
 %if %{_lib} == lib64
 %patch1 -p2 -b .lib64
@@ -203,12 +203,6 @@ cp $topdir/python $topdir/python%{pybasever}
 $topdir/python Tools/scripts/pathfix.py -i "/usr/bin/env python%{pybasever}" .
 make OPT="$CFLAGS" %{?_smp_mflags}
 
-## # Doc
-## %if %{with_doc}
-## make %{?_smp_mflags} -C Doc html
-## rm Doc/html/index.html.in
-## %endif
-
 
 # Test
 %if %{run_test}
@@ -235,8 +229,6 @@ export PYTHONPATH=$topdir/Lib:$topdir/Lib/test:$topdir/Lib/lib-tk:$topdir/Lib/si
 find ./Lib -name '*.py[co]' -print | xargs rm -f
 ./python -tt ./Lib/test/regrtest.py -l
 ./python -tt ./Lib/test/regrtest.py -l
-#./python -tt ./Lib/test/test_bsddb.py -l
-#./python -tt ./Lib/test/test_bsddb.py -l
 %endif
 
 
@@ -262,6 +254,8 @@ done
 
 ## docs
 %if %{with_doc}
+tar xvzf %SOURCE1
+mv python-%{version}-docs-html Doc/html
 %endif
 
 
@@ -386,6 +380,12 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 21 2010 Shu KONNO <owa@bg.wakwak.com> 2.6.5-2
+- replaced Patch0: python-2.6.?-Setup.dist.patch
+- replaced Patch1: python-2.6.?-lib64.patch
+- added python-2.6.5-docs-html.tar.bz2
+- dropt Python-2.6.4-Doc.78718.tgz
+
 * 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