- update to 2.7.4

* bugfix-only release
- drop upstreamed patches:
    pypirc-secure.diff
    python-2.7.3-multiprocessing-join.patch
    ctypes-libffi-aarch64.patch
- drop python-2.7rc2-configure.patch as it doesn't seem necessary anymore

- removed %docdir/python/README from package (conflict with python-base)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=137

python-doc.spec

@@ -22,7 +22,7 @@ License:        Python-2.0
 Summary:        Additional Package Documentation for Python
 Url:            http://www.python.org/
 Group:          Development/Languages/Python
-%define         pyver   2.7.3
+%define         pyver   2.7.4
 %define         tarname Python-%{pyver}
 Source0:        %{tarname}.tar.bz2
 Source1:        http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2
@@ -31,9 +31,9 @@ Source3:        http://docs.python.org/%{version}/archives/python-%{pyver}-docs-
 # COMMON-PATCH-BEGIN
 Patch1:         python-2.7-dirs.patch
 Patch2:         python-distutils-rpm-8.patch
-Patch3:         python-2.7.3rc2-multilib.patch
+Patch3:         python-2.7.4-multilib.patch
 Patch4:         python-2.5.1-sqlite.patch
-Patch5:         python-2.7.3rc2-canonicalize2.patch
+Patch5:         python-2.7.4-canonicalize2.patch
 Patch6:         python-2.7rc2-configure.patch
 Patch7:         python-2.6-gettext-plurals.patch
 Patch8:         python-2.6b3-curses-panel.patch
@@ -85,7 +85,7 @@ Python, and Macintosh Module Reference in PDF format.
 %patch3
 %patch4
 %patch5
-%patch6
+#%patch6
 %patch7
 %patch8
 %patch9 -p1
@@ -96,13 +96,16 @@ Python, and Macintosh Module Reference in PDF format.
 %ifarch ppc ppc64
 %patch15 -p1
 %endif
-%patch16 -p1
+#%patch16 -p1
 %patch17
 %patch18
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
-%patch22 -p1
+#%patch21 -p1
+#%patch22 -p1
+
+# drop Autoconf version requirement
+sed -i 's/^version_required/dnl version_required/' configure.ac
 # COMMON-PREP-END
 
 %build
@@ -118,7 +121,8 @@ mv $PDOCS/docs-pdf $PDOCS/paper-a4
 tar xfj %{SOURCE3} -C $PDOCS
 mv $PDOCS/docs-pdf $PDOCS/paper-letter
 install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt
-install -c -m 644 README $PDOCS/README
+# this is part of main package
+#install -c -m 644 README $PDOCS/README 
 for i in Misc/* ; do
   [ -f $i ] && install -c -m 644 $i $PDOCS/Misc/
 done
@@ -129,7 +133,7 @@ done
 %doc %{_docdir}/python/Misc
 %doc %{_docdir}/python/html
 %doc %{_docdir}/python/ACKS.txt
-%doc %{_docdir}/python/README
+#%doc %{_docdir}/python/README
 
 %files pdf
 %defattr(644,root,root,755)