#13 Don't build the package as 1.1.4.dev0 + Remove the empty python-mako-doc package
Merged 2 years ago by churchyard. Opened 2 years ago by churchyard.
rpms/ churchyard/python-mako no_dev  into  rawhide

file modified
+11 -18
@@ -1,11 +1,10 @@ 

  Name: python-mako

  Version: 1.1.4

- Release: 5%{?dist}

+ Release: 6%{?dist}

  BuildArch: noarch

  

- # Mostly MIT, but _ast_util.py is Python licensed.

- # The documentation contains javascript for search licensed BSD or GPLv2

- License: (MIT and Python) and (BSD or GPLv2)

+ # Mostly MIT, but _ast_util.py is Python licensed

+ License: MIT and Python

  Summary: Mako template library for Python

  URL: http://www.makotemplates.org/

  Source0: https://github.com/sqlalchemy/mako/archive/rel_%(echo %{version} | sed "s/\./_/g").tar.gz
@@ -35,6 +34,7 @@ 

  Recommends: python3-beaker

  

  Obsoletes: python2-mako < 1.1.0-3

+ Obsoletes: python-mako-doc < 1.1.4-6

  

  %{?python_provide:%python_provide python3-mako}

  
@@ -43,18 +43,13 @@ 

  This package contains the mako module built for use with python3.

  

  

- %package doc

- Summary: Documentation for the Mako template library for Python

- Suggests: python3-mako = %{version}-%{release}

- 

- %description doc %_description

- 

- This package contains documentation in text and HTML formats.

- 

  

  %prep

  %autosetup -p1 -n mako-rel_%(echo %{version} | sed "s/\./_/g")

  

+ # the package ends up installed as %%{version}.dev0 otherwise:

+ sed -i '/tag_build = dev/d' setup.cfg

+ 

  

  %build

  %py3_build
@@ -67,9 +62,6 @@ 

  ln -s ./mako-render-%{python3_version} %{buildroot}/%{_bindir}/mako-render-3

  ln -s ./mako-render-%{python3_version} %{buildroot}/%{_bindir}/mako-render

  

- # These are supporting files for building the docs.  No need to ship

- rm -rf doc/build

- 

  

  %check

  pytest-3
@@ -84,11 +76,12 @@ 

  %{python3_sitelib}/mako/

  %{python3_sitelib}/Mako-*.egg-info/

  

- %files doc

- %doc doc

- 

  

  %changelog

+ * Fri Oct 29 2021 Miro Hrončok <mhroncok@redhat.com> - 1.1.4-6

+ - Don't build the package as 1.1.4.dev0

+ - Remove the empty python-mako-doc package

+ 

  * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-5

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

no initial comment

The change looks good.

As a side note, while checking the installed package, I noticed that -doc package only contains an empty doc folder, no actual documentation. Looking at the specfile, there is no documentation build and doc contents is being explicitly removed in install phase. Is the subpackage provided like this on purpose?

1 new commit added

  • Remove the empty python-mako-doc package
2 years ago

Added a second commit, Remove the empty python-mako-doc package.

LGTM, feel free to ship it.

Pull-Request has been merged by churchyard

2 years ago
Metadata