#12 F29: Update to 2.7.17 and sync with f31
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.
rpms/ churchyard/python2-docs f31-2.7.17  into  f29

file modified
+1

@@ -17,3 +17,4 @@ 

  /Python-2.7.14.tar.xz

  /Python-2.7.15.tar.xz

  /Python-2.7.16.tar.xz

+ /Python-2.7.17.tar.xz

file modified
+20 -12

@@ -2,13 +2,14 @@ 

  

  Name:			python2-docs

  # The Version needs to be in-sync with the "python2" package:

- Version:		2.7.16

+ Version:		2.7.17

  Release:		1%{?dist}

  Summary:		Documentation for the Python 2 programming language

  License:		Python

  URL:			https://www.python.org/

  

  Source:			https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz

+ 

  # this changes the makefile so that build requires are used instead of

  # hard coded svn checkout to get sphinx

  Patch19: python-2.7-texinfomakefile.patch

@@ -17,15 +18,16 @@ 

  

  BuildArch:		noarch

  

- BuildRequires:	python2

- BuildRequires:	python2-docutils

- BuildRequires:	python2-pygments

- BuildRequires:	python2-sphinx

+ BuildRequires:	python-rpm-macros

+ BuildRequires:	python3

+ BuildRequires:	python3-docutils

+ BuildRequires:	python3-pygments

+ BuildRequires:	python3-sphinx

  BuildRequires:	linkchecker

  

  Recommends:		python2 = %{version}

  

- Provides:		python-docs = %{version}-%{release}

+ %{?python_provide:%python_provide %{name}}

  

  %description

  The python2-docs package contains documentation on the Python 2

@@ -38,7 +40,7 @@ 

  Summary:		Documentation for the Python 2 programming language as info pages

  BuildRequires:	texinfo

  

- Provides:		python-docs-info = %{version}-%{release}

+ %{?python_provide:%python_provide %{name}-info}

  

  %description info

  The python2-docs-info package contains documentation on the Python 2

@@ -48,10 +50,7 @@ 

  documentation for the Python 2 language using the info command or Emacs.

  

  %prep

- %setup -q -n Python-%{version}

- 

- %patch19 -p1 -b .texinfomakefile

- %patch20 -p1 -b .texinfobuilder

+ %autosetup -p1 -n Python-%{version}

  

  %build

  make -C Doc html

@@ -93,10 +92,19 @@ 

  %license	LICENSE

  

  %files info

- %{_infodir}/python.info.gz

+ %{_infodir}/python.info.*

  %license	LICENSE

  

  %changelog

+ * Sun Oct 20 2019 Miro Hrončok <mhroncok@redhat.com> - 2.7.17-1

+ - Update to 2.7.17

+ 

+ * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.16-3

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

+ 

+ * Wed Apr 24 2019 Björn Esser <besser82@fedoraproject.org> - 2.7.16-2

+ - Remove hardcoded gzip suffix from GNU info pages

+ 

  * Mon Mar 11 2019 Miro Hrončok <mhroncok@redhat.com> - 2.7.16-1

  - Update to 2.7.16

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (Python-2.7.16.tar.xz) = 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0

+ SHA512 (Python-2.7.17.tar.xz) = 2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a

no initial comment

Pull-Request has been merged by churchyard

2 months ago