[Bug 226341] Merge Review: python-docs

[bugzilla at redhat.com]

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.


https://bugzilla.redhat.com/show_bug.cgi?id=226341





--- Comment #6 from Roman Rakus <rrakus at redhat.com>  2009-05-06 05:53:09 EDT ---
diff -u -p -r1.18 python-docs.spec
--- python-docs.spec 26 Feb 2009 21:14:56 -0000 1.18
+++ python-docs.spec 6 May 2009 09:47:22 -0000
@@ -10,7 +10,7 @@

 %define pybasever 2.6

-Summary: Documentation for the Python programming language.
+Summary: Documentation for the Python programming language
 Name: %{python}-docs
 Version: %{pybasever}
 Release: 2%{?dist}
@@ -20,7 +20,6 @@ Source: http://www.python.org/ftp/python
 BuildArch: noarch

 Patch4: python-2.6-nowhatsnew.patch
-#Patch17: python-2.4-tex-fix.patch
 Patch18: python-2.6-extdocmodules.patch

 Requires: %{python} = %{version}
@@ -29,7 +28,8 @@ Obsoletes: python2-docs
 Provides: python2-docs = %{version}
 %endif

-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 BuildRequires: %{python} python-sphinx python-docutils python-jinja
 BuildRequires: python-pygments
 URL: http://www.python.org/
@@ -46,19 +46,16 @@ for the Python language.
 %setup -q -n Python-%{version}

 %patch4 -p1 -b .nowhatsnew
-#%%patch17 -p1 -b .tex-fix
 %patch18 -p1 -b .extdocmodules

 %build
 topdir=`pwd`

-pushd Doc
-make html
+make -C Doc html
 #rm html/index.html.in Makefile* info/Makefile tools/sgmlconv/Makefile
-popd

 %install
-[ -d $RPM_BUILD_ROOT ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT

 mkdir $RPM_BUILD_ROOT

@@ -66,7 +63,7 @@ mkdir $RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT

 %files
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
 %doc Misc/NEWS  Misc/README Misc/cheatsheet 
 %doc Misc/HISTORY Doc/build/html

>- What is the stuff at the beginning needed for?
I don't know. The same is in python spec file

>- You can use 
>%{!?pyver: %global pyver %(%{__python} -c "import sys ; print
>sys.version[:3]")}
>to get the Python base version.
I don't change it. I think the better is to set version by hand.


>- Patches are not documented.
Patches are from previous package - python. I don't know what they were
solving...

>- Commented patches should be removed.
Commented lines removed. Patches aren't in cvs.

All else should be fixed.

-- 
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.