#1 Add Python 3.6 sub-package
Merged 5 years ago by orion. Opened 5 years ago by cottsay.
Unknown source epel7  into  epel7

file modified
+52 -3
@@ -2,7 +2,7 @@

  

  Name:           python3-%{srcname}

  Version:        0.12

- Release:        0.8.20140510svn7747%{?dist}

+ Release:        0.9.20140510svn7747%{?dist}

  Summary:        System for processing plaintext documentation

  

  # See COPYING.txt for information
@@ -18,7 +18,6 @@

  

  BuildArch:       noarch

  

- BuildRequires:  python%{python3_pkgversion}-devel

  BuildRequires:  python-tools

  

  %description
@@ -34,6 +33,7 @@

  

  %package -n python%{python3_pkgversion}-%{srcname}

  Summary:        System for processing plaintext documentation for python %{python3_version}

+ BuildRequires:  python%{python3_pkgversion}-devel

  # This isn't yet packaged for EPEL, but it should mostly work without it

  #Requires:       python%{python3_pkgversion}-pillow

  
@@ -50,6 +50,27 @@

  

  This package contains the module, ported to run under python %{python3_version}.

  

+ %if 0%{?python3_other_pkgversion}

+ %package -n python%{python3_other_pkgversion}-%{srcname}

+ Summary:        System for processing plaintext documentation for python %{python3_other_version}

+ BuildRequires:  python%{python3_other_pkgversion}-devel

+ # This isn't yet packaged for EPEL, but it should mostly work without it

+ #Requires:       python%{python3_other_pkgversion}-pillow

+ 

+ %description -n python%{python3_other_pkgversion}-%{srcname}

+ The Docutils project specifies a plaintext markup language, reStructuredText,

+ which is easy to read and quick to write.  The project includes a python

+ library to parse rST files and transform them into other useful formats such

+ as HTML, XML, and TeX as well as commandline tools that give the enduser

+ access to this functionality.

+ 

+ Currently, the library supports parsing rST that is in standalone files and

+ PEPs (Python Enhancement Proposals).  Work is underway to parse rST from

+ Python inline documentation modules and packages.

+ 

+ This package contains the module, ported to run under python %{python3_other_version}.

+ %endif # python3_other_pkgversion

+ 

  

  %package doc

  Summary:        Documentation for python-%{srcname}
@@ -72,6 +93,7 @@

  

  %build

  %py3_build

+ %{?python3_other_pkgversion: %py3_other_build}

  

  

  %install
@@ -84,6 +106,20 @@

      mv $file `dirname $file`/`basename $file .py`-%{python3_version}

  done

  

+ %if 0%{?python3_other_pkgversion}

+ %py3_other_install \

+     --install-scripts %{_bindir}/%{python3_other_pkgversion}

+ 

+ # docutils setup.py runs 2to3 on a copy of the tests and puts it in sitelib.

+ rm -rf %{buildroot}%{python3_other_sitelib}/test

+ 

+ for file in %{buildroot}/%{_bindir}/%{python3_other_pkgversion}/*.py; do

+     mv $file `dirname $file`/../`basename $file .py`-%{python3_other_version}

+ done

+ 

+ rmdir %{buildroot}%{_bindir}/%{python3_other_pkgversion}

+ %endif # python3_other_pkgversion

+ 

  # We want the licenses but don't need this build file

  rm -f licenses/docutils.conf

  
@@ -94,6 +130,7 @@

  %check

  mv biohazard.swf docs/user/rst/images/biohazard.swf

  %{__python3} test3/alltests.py

+ %{?python3_other_pkgversion: %{__python3_other} test3/alltests.py}

  rm docs/user/rst/images/biohazard.swf

  rm -r tools/editors/emacs/tests

  
@@ -102,14 +139,26 @@

  %license COPYING.txt licenses

  %doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 

  %doc THANKS.txt tools/editors

- %{_bindir}/*

+ %{_bindir}/*-%{python3_version}

  %{python3_sitelib}/*

  

+ %if 0%{?python3_other_pkgversion}

+ %files -n python%{python3_other_pkgversion}-%{srcname}

+ %license COPYING.txt licenses

+ %doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt

+ %doc THANKS.txt tools/editors

+ %{_bindir}/*-%{python3_other_version}

+ %{python3_other_sitelib}/*

+ %endif # python3_other_pkgversion

+ 

  %files doc

  %license COPYING.txt licenses

  %doc docs/*

  

  %changelog

+ * Wed Jan 16 2019 Scott K Logan <logans@cottsay.net> - 0.12-0.9.20140510svn7747

+ - Add Python 3.6 sub-package

+ 

  * Sun Nov 27 2016 Orion Poplawski <orion@cora.nwra.com> - 0.12-0.8.20140510svn7747

  - Use %%license for COPYING.txt

  - Make separate doc sub-package

The Python 3.6 prerequisites exist in EPEL7, and the Python 3.6 project I'm working with will require docutils.

rebased onto 2369fb9

5 years ago

The python3_other stuff needs to be conditional on:

%if 0%{?python3_other_pkgversion}

Also move the BR on the python3_pgkversion devel package into the respective %package sections.

Thanks!

rebased onto 3c42dd0

5 years ago

I made the suggested changes. Let me know if there is anything else I can do.

Thanks!

@orion - anything else I can do to help move this along?

Thanks!

Pull-Request has been merged by orion

5 years ago

Sorry, I'm pretty swamped. Thanks again, building.

Sorry if I came off pushy - just wanted to ensure this hadn't fallen off the radar. Thanks for finishing this off.

Metadata