#1 explicit dependency versions and small cleanups
Closed 5 years ago by fschwarz. Opened 6 years ago by fschwarz.
Unknown source master  into  master

file modified
+30 -16
@@ -6,7 +6,7 @@

  

  Name:           weasyprint

  Version:        0.22

- Release:        9%{?dist}

+ Release:        10%{?dist}

  Group:          Applications/File

  Summary:        Utility to render HTML and CSS to PDF

  License:        BSD
@@ -31,12 +31,16 @@

  %{?python_provide:%python_provide python2-weasyprint}

  Group:          Development/Libraries

  Summary:        Python library to render HTML and CSS to PDF

- Requires:       python-tinycss python-cssselect python-pyphen

- Requires:	python-html5lib >= 1:0.999

- Requires:       python-cairocffi python-cairosvg

+ Requires:       hyphen

+ Requires:       pango

+ Requires:       python-cairocffi >= 0.5

+ Requires:       python-cairosvg >= 0.4.1

+ Requires:       python-cssselect >= 0.6

+ Requires:       python-html5lib >= 1:0.999

+ Requires:       python-lxml >= 3.0

  Requires:       python-setuptools

- Requires:       python-lxml

- Requires:       hyphen pango

+ Requires:       python-tinycss == 0.3

+ Requires:       python-pyphen >= 0.8

  # Weasyprint will fail if no fonts are installed. There's no way to know

  # what fonts the user would actually want, but require a few common ones

  # that might be useful:
@@ -53,12 +57,16 @@

  %package -n python3-weasyprint

  Group:          Development/Libraries

  Summary:        Python library to render HTML and CSS to PDF

- Requires:       python3-tinycss python3-cssselect python3-pyphen

- Requires:	python3-html5lib >= 0.99

- Requires:       python3-cairocffi python3-CairoSVG

+ Requires:       hyphen

+ Requires:       pango

+ Requires:       python3-cairocffi >= 0.5

+ Requires:       python3-cairosvg >= 0.4.1

+ Requires:       python3-cssselect >= 0.6

+ Requires:       python3-html5lib >= 0.999

+ Requires:       python3-lxml >= 3.0

  Requires:       python3-setuptools

- Requires:       python3-lxml

- Requires:       hyphen pango

+ Requires:       python3-tinycss == 0.3

+ Requires:       python3-pyphen >= 0.8

  # Weasyprint will fail if no fonts are installed. There's no way to know

  # what fonts the user would actually want, but require a few common ones

  # that might be useful:
@@ -88,7 +96,7 @@

  %if 0%{?with_python3}

  pushd %{py3dir}

  # rpmbuild defaults to exporting LANG="C", which screws up Python 3's

- # default encoidng, and breaks setup.py reading cairocffi/__init__.py,

+ # default encoding, and breaks setup.py reading cairocffi/__init__.py,

  # even though that file has an explicit tag of being UTF-8.

  LANG="en_US.UTF-8" %{__python3} setup.py build

  popd
@@ -106,20 +114,26 @@

  %endif # with_python3

  

  %files

- %doc AUTHORS LICENSE README

+ %doc AUTHORS README

+ %license LICENSE

  %{_bindir}/weasyprint

  

  %files -n python2-weasyprint

- %doc AUTHORS CHANGES LICENSE README

+ %license LICENSE

+ %doc AUTHORS CHANGES README

  %{python_sitelib}/*

  

  %if 0%{?with_python3}

  %files -n python3-weasyprint

- %doc AUTHORS CHANGES LICENSE README

+ %license LICENSE

+ %doc AUTHORS CHANGES README

  %{python3_sitelib}/*

  %endif # with_python3

  

  %changelog

+ * Tue Dec 12 2017 Felix Schwarz <fschwarz@fedoraproject.org> - 0.22-10

+ - use license macro

+ 

  * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.22-9

  - Python 2 binary package renamed to python2-weasyprint

    See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
@@ -164,7 +178,7 @@

  - Add some missing Requires (#1076734).

  

  * Mon Mar 10 2014 Eric Smith <brouhaha@fedoraproject.org> 0.21-1

- - Update to lastest upstream.

+ - Update to latest upstream.

  

  * Sun Jul 28 2013 Eric Smith <brouhaha@fedoraproject.org> 0.19.2-3

  - Remove /usr/bin/env from Python script shebang lines.

While updating the package to 0.39 I came across a few things I wanted to fix. Hopefully everything should be clear just from the commits but maybe some extra text helps:
- license macro: Fedora packaging policy conformance
- reorder requirements/explicit versions: when updating WeasyPrint we also need to update some versions. These changes made it much easier for me to track the required changes and maybe helps to estimate if Fedora changes can/should be ported to EL7.

There are more changes for Fedora packaging policy (e.g. python2- prefixing) but I'll try to get the package updated to 0.39 (maybe even 0.41) first.

@fschwarz I get the impression that Eric Smith (@brouhaha) is no longer able to maintain the WeasyPrint package, since it hasn't been updated in a long time. Maybe you should consider taking over? If not, seems like WeasyPrint should be orphaned, because it hasn't actually worked in Fedora in a while.

Pull-Request has been closed by fschwarz

5 years ago

integrated in commit 9bfdc59 - closing.