diff --git a/.gitignore b/.gitignore index 56e4b79..eb63832 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /fmt-3.0.1.tar.gz /fmt-3.0.2.tar.gz /5.2.1.tar.gz +/5.3.0.tar.gz diff --git a/doc-build-do-not-create-virtual-environment.patch b/doc-build-do-not-create-virtual-environment.patch index 280baf6..e437dcd 100644 --- a/doc-build-do-not-create-virtual-environment.patch +++ b/doc-build-do-not-create-virtual-environment.patch @@ -1,20 +1,9 @@ -From: "Eugene V. Lyubimkin" -Date: Sat, 7 Nov 2015 19:05:57 +0100 -Subject: doc: build: do not create virtual environment - -Since we have no packages to fetch or locally install at the building -time. ---- - doc/build.py | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/doc/build.py b/doc/build.py -index 1ce12cf..4ff82c5 100755 ---- a/doc/build.py -+++ b/doc/build.py -@@ -7,16 +7,6 @@ from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE +diff -up fmt-5.3.0/doc/build.py.orig fmt-5.3.0/doc/build.py +--- fmt-5.3.0/doc/build.py.orig 2019-06-10 14:38:07.646072524 +0200 ++++ fmt-5.3.0/doc/build.py 2019-06-10 14:38:23.793201765 +0200 +@@ -7,16 +7,6 @@ from subprocess import check_call, check - versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1'] + versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0'] -def create_build_env(dirname='virtualenv'): - # Create virtualenv. @@ -29,7 +18,7 @@ index 1ce12cf..4ff82c5 100755 def build_docs(version='dev', **kwargs): doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__))) work_dir = kwargs.get('work_dir', '.') -@@ -65,5 +55,4 @@ def build_docs(version='dev', **kwargs): +@@ -79,5 +69,4 @@ def build_docs(version='dev', **kwargs): return html_dir if __name__ == '__main__': diff --git a/doc-build-removed-all-pip-internet-stuff.patch b/doc-build-removed-all-pip-internet-stuff.patch index 4a6b120..89f6df0 100644 --- a/doc-build-removed-all-pip-internet-stuff.patch +++ b/doc-build-removed-all-pip-internet-stuff.patch @@ -1,23 +1,13 @@ -From: "Eugene V. Lyubimkin" -Date: Sat, 7 Nov 2015 18:55:28 +0100 -Subject: doc: build: removed all pip/internet stuff - -Debian package must only use locally available packages and resources. ---- - doc/build.py | 43 +------------------------------------------ - 1 file changed, 1 insertion(+), 42 deletions(-) - -diff --git a/doc/build.py b/doc/build.py -index 5947e46..dc0d861 100755 ---- a/doc/build.py -+++ b/doc/build.py +diff -up fmt-5.3.0/doc/build.py.orig fmt-5.3.0/doc/build.py +--- fmt-5.3.0/doc/build.py.orig 2019-06-10 14:34:44.351430493 +0200 ++++ fmt-5.3.0/doc/build.py 2019-06-10 14:36:25.608248599 +0200 @@ -4,27 +4,9 @@ from __future__ import print_function import errno, os, shutil, sys, tempfile from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE -from distutils.version import LooseVersion - versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1'] + versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0'] -def pip_install(package, commit=None, **kwargs): - "Install package using pip." @@ -39,7 +29,7 @@ index 5947e46..dc0d861 100755 def create_build_env(dirname='virtualenv'): # Create virtualenv. if not os.path.exists(dirname): -@@ -34,30 +16,6 @@ def create_build_env(dirname='virtualenv'): +@@ -34,30 +16,6 @@ def create_build_env(dirname='virtualenv activate_this_file = os.path.join(dirname, scripts_dir, 'activate_this.py') with open(activate_this_file) as f: exec(f.read(), dict(__file__=activate_this_file)) diff --git a/fmt.spec b/fmt.spec index 3602b84..e9ab557 100644 --- a/fmt.spec +++ b/fmt.spec @@ -1,6 +1,6 @@ Name: fmt -Version: 5.2.1 -Release: 2%{?dist} +Version: 5.3.0 +Release: 1%{?dist} Summary: Small, safe and fast formatting library for C++ License: BSD @@ -106,12 +106,18 @@ popd %{_includedir}/fmt/ %{_libdir}/libfmt.so %{_datadir}/cmake/fmt/ +%{_datadir}/pkgconfig/fmt.pc %files doc %doc %{_datadir}/doc/fmt/ %license doc/python-license.txt %changelog +* Mon Jun 10 2019 Jan Staněk - 5.3.0-1 +- Update to 5.3.0 +- Recreate documentation build patches +- Package new pkg-config files + * Thu Jan 31 2019 Fedora Release Engineering - 5.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index bd47fda..5a37358 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.2.1.tar.gz) = 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8 +SHA512 (5.3.0.tar.gz) = 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8