diff --git a/python-base.spec b/python-base.spec index 6c2e26c..8ce60de 100644 --- a/python-base.spec +++ b/python-base.spec @@ -33,7 +33,7 @@ Obsoletes: python-64bit # Summary: Python Interpreter base package Version: 2.6.0 -Release: 9 +Release: 10 #%define tarname Python-%{version} %define tarname Python-2.6 Source0: %{tarname}.tar.bz2 diff --git a/python-doc.changes b/python-doc.changes index 3210e84..ddba172 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 11 10:52:59 CET 2009 - coolo@suse.de + +- fix build in actually packaging the docs + ------------------------------------------------------------------- Thu Oct 9 18:58:15 CEST 2008 - matejcik@suse.cz diff --git a/python-doc.spec b/python-doc.spec index 1a68647..cef9f2e 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -24,7 +24,7 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.6 -Release: 9 +Release: 10 %define pyver 2.6 BuildArch: noarch %define tarname Python-%{pyver} @@ -73,12 +73,12 @@ Authors: export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{pyname} install -d -m 755 $PDOCS/Misc install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html -tar xfj %{S:1} -C $PDOCS/html -( cd $PDOCS/html; mv Python-Docs-%{version}/* . ; rmdir Python-Docs-%{version}) -tar xfj %{S:2} -C $PDOCS/paper-a4 -( cd $PDOCS/paper-a4; mv Python-Docs-%{version}/* . ; rmdir Python-Docs-%{version}) -tar xfj %{S:3} -C $PDOCS/paper-letter -( cd $PDOCS/paper-letter; mv Python-Docs-%{version}/* . ; rmdir Python-Docs-%{version}) +tar xfj %{S:1} -C $PDOCS/ +mv $PDOCS/python-docs-html $PDOCS/html +tar xfj %{S:2} -C $PDOCS +mv $PDOCS/docs-pdf $PDOCS/paper-a4 +tar xfj %{S:3} -C $PDOCS +mv $PDOCS/docs-pdf $PDOCS/paper-letter install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt install -c -m 644 Doc/TODO.txt $PDOCS/TODO.txt install -c -m 644 Doc/README.txt $PDOCS/README.txt @@ -104,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{pyname}/paper-letter %changelog +* Wed Mar 11 2009 coolo@suse.de +- fix build in actually packaging the docs * Thu Oct 09 2008 matejcik@suse.cz - updated docs to version 2.6 * Mon Sep 15 2008 matejcik@suse.cz diff --git a/python.spec b/python.spec index 0ef3bca..3419a52 100644 --- a/python.spec +++ b/python.spec @@ -35,7 +35,7 @@ Obsoletes: python-64bit Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.6.0 -Release: 9 +Release: 10 Requires: python-base = %{version} #%define tarname Python-%{version} %define tarname Python-2.6