Browse Source

change python24,25 docs to noarch

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1994 ec354946-7b23-47d6-9f5a-488ba84defc7
owa 13 years ago
parent
commit
1e67a7cb4c
2 changed files with 20 additions and 12 deletions
  1. 10 6
      p/python24/python24-vl.spec
  2. 10 6
      p/python25/python25-vl.spec

+ 10 - 6
p/python24/python24-vl.spec

@@ -1,6 +1,7 @@
 # If you want to run test, add "--define '_run_test 1'" to rpm option
+# If you want to get document, add "--with doc" to rpm option
 %define run_test %{?_run_test:1}%{!?_run_test:0}
-%define with_doc %{?_without_doc:1}%{!?_without_doc:0}
+%define with_doc %{?_with_doc:1}%{!?_with_doc:0}
 %define unicode	 ucs4
 %define tcl_major 8.4
 %define tk_major 8.4
@@ -13,7 +14,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python2.4 インタプリタ
 Name: python24
 Version: 2.4.6
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: PSF - see LICENSE
 Group: Development/Languages
 URL: http://www.python.org/2.4/
@@ -65,15 +66,11 @@ Provides: python2.4
 
 BuildRequires: db4-devel
 BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
-#BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel, tetex-latex
 BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
 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}
-BuildRequires: latex2html
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -122,10 +119,13 @@ Obsoletes: python2-tools
 The Python package includes several development tools that are used
 to build python programs.
 
+%if %{with_doc}
 %package docs
 Summary: Documentation for the Python programming language.
 Summary(ja): Python プログラミング言語のドキュメント
 Group: Applications/Documentation
+BuildArch: noarch
+BuildRequires: latex2html
 Obsoletes: python2-docs
 
 %description docs
@@ -135,6 +135,7 @@ in ASCII text files and in LaTeX source files.
 
 Install the python-docs package if you'd like to use the documentation
 for the Python language.
+%endif
 
 %package tkinter
 Summary: A graphical user interface for the Python scripting language.
@@ -390,6 +391,9 @@ rm -fr $RPM_BUILD_ROOT
 %{python_lib}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Oct 05 2010 Shu KONNO <owa@bg.wakwak.com> python2.4-2.4.6-5
+- changed %{name}-docs to noarch
+
 * Sun Sep 26 2010 Shu KONNO <owa@bg.wakwak.com> python2.4-2.4.6-4
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 10 - 6
p/python25/python25-vl.spec

@@ -1,6 +1,7 @@
 # If you want to run test, add "--define '_run_test 1'" to rpm option
+# If you want to get document, add "--with doc" to rpm option
 %define run_test %{?_run_test:1}%{!?_run_test:0}
-%define with_doc %{?_without_doc:1}%{!?_without_doc:0}
+%define with_doc %{?_with_doc:1}%{!?_with_doc:0}
 %define unicode	 ucs4
 %define tcl_major 8.4
 %define tk_major 8.4
@@ -13,7 +14,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python25
 Version: %{pybasever}.5
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: PSF - see LICENSE
 Group: Development/Languages
 URL: http://www.python.org/%{pybasever}/
@@ -63,15 +64,11 @@ Provides: Distutils
 
 BuildRequires: db4-devel
 BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
-#BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel, tetex-latex
 BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
 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}
-BuildRequires: latex2html
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -121,10 +118,13 @@ Obsoletes: python2-tools
 The Python package includes several development tools that are used
 to build python programs.
 
+%if %{with_doc}
 %package docs
 Summary: Documentation for the Python programming language.
 Summary(ja): Python プログラミング言語のドキュメント
 Group: Applications/Documentation
+BuildArch: noarch
+BuildRequires: latex2html
 Obsoletes: python2-docs
 
 %description docs
@@ -134,6 +134,7 @@ in ASCII text files and in LaTeX source files.
 
 Install the python-docs package if you'd like to use the documentation
 for the Python language.
+%endif
 
 %package tkinter
 Summary: A graphical user interface for the Python scripting language.
@@ -403,6 +404,9 @@ rm -fr $RPM_BUILD_ROOT
 %{python_lib}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Oct 05 2010 Shu KONNO <owa@bg.wakwak.com> 2.5.5-4
+- changed %{name}-docs to noarch
+
 * Sun Sep 26 2010 Shu KONNO <owa@bg.wakwak.com> 2.5.5-3
 - rebuilt with rpm-4.8.1 for pkg-config