From 554f2de91fee2382eebd716e3598f3210e797c19 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Sun, 19 May 2019 16:33:51 -0700 Subject: [PATCH] Update to 3.0.12 - Switch to Python 3 sphinx --- .gitignore | 1 + python-filelock.rpmlintrc | 4 +- python-filelock.spec | 104 ++++++++------------------------------ sources | 2 +- 4 files changed, 24 insertions(+), 87 deletions(-) diff --git a/.gitignore b/.gitignore index 25c4727..700b112 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /python-filelock-0980867.tar.gz /python-filelock-b71c3a4.tar.gz /py-filelock-3.0.10.tar.gz +/py-filelock-3.0.12.tar.gz diff --git a/python-filelock.rpmlintrc b/python-filelock.rpmlintrc index 3d66932..77687c9 100644 --- a/python-filelock.rpmlintrc +++ b/python-filelock.rpmlintrc @@ -1,3 +1,3 @@ # KNOWN BUGS -addFilter(r'file-not-utf8 /usr/share/doc/python-filelock-doc(-[\d\.]+)?/html/objects.inv') -addFilter(r'wrong-file-end-of-line-encoding /usr/share/doc/python-filelock-doc/html/objects.inv') +addFilter(r': file-not-utf8 /usr/share/doc/python-filelock-doc(-[\d\.]+)?/html/objects.inv') +addFilter(r': wrong-file-end-of-line-encoding /usr/share/doc/python-filelock-doc/html/objects.inv') diff --git a/python-filelock.spec b/python-filelock.spec index 926a780..60d7745 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,14 +1,11 @@ -%{?!_without_doc:%global with_doc 1} %{?!_without_python2:%global with_python2 0%{?_with_python2:1} || !(0%{?fedora} >= 30 || 0%{?rhel} >= 8)} %{?!_without_python3:%global with_python3 0%{?_with_python3:1} || !0%{?rhel} || 0%{?rhel} >= 7} -%{?!_without_python3_other:%global with_python3_other 0%{?_with_python3_other:1} || 0%{?rhel} == 7} -%{?!_without_tests:%global with_tests 1} %global srcname filelock Name: python-%{srcname} -Version: 3.0.10 -Release: 2%{?dist} +Version: 3.0.12 +Release: 1%{?dist} Summary: A platform independent file lock License: Unlicense @@ -24,37 +21,26 @@ file locking mechanism for Python. The lock includes a lock counter and is thread safe. This means, when locking the same lock object twice, it will not block. -%if 0%{?with_doc} + %package doc Summary: Documentation for %{srcname}, %{summary} - -%if !0%{?rhel} || 0%{?rhel} >= 8 BuildRequires: python%{python3_pkgversion}-sphinx BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster -%else # rhel -BuildRequires: python2-sphinx -BuildRequires: python2-sphinx-theme-alabaster -%endif # rhel %description doc %{summary} -%endif # with_doc + %if 0%{?with_python2} %package -n python2-%{srcname} Summary: %{summary} - BuildRequires: python2-devel BuildRequires: python2-setuptools +%{?python_provide:%python_provide python2-%{srcname}} %if 0%{?fedora} -%{?python_provide:%python_provide python2-%{srcname}} -%if 0%{?with_doc} Recommends: %{name}-doc %endif # with_doc -%else # fedora -Provides: %{name} = %{version}-%{release} -%endif # fedora %description -n python2-%{srcname} This package contains a single module, which implements a platform independent @@ -64,18 +50,16 @@ The lock includes a lock counter and is thread safe. This means, when locking the same lock object twice, it will not block. %endif # with_python2 + %if 0%{?with_python3} %package -n python%{python3_pkgversion}-%{srcname} Summary: %{summary} - BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} %if 0%{?fedora} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} -%if 0%{?with_doc} Recommends: %{name}-doc -%endif # with_doc %endif # fedora %description -n python%{python3_pkgversion}-%{srcname} @@ -86,31 +70,11 @@ The lock includes a lock counter and is thread safe. This means, when locking the same lock object twice, it will not block. %endif # with_python3 -%if 0%{?with_python3_other} -%package -n python%{python3_other_pkgversion}-%{srcname} -Summary: %{summary} - -BuildRequires: python%{python3_other_pkgversion}-devel -BuildRequires: python%{python3_other_pkgversion}-setuptools - -%if 0%{?fedora} -%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{srcname}} -%if 0%{?with_doc} -Recommends: %{name}-doc -%endif # with_doc -%endif # fedora - -%description -n python%{python3_other_pkgversion}-%{srcname} -This package contains a single module, which implements a platform independent -file locking mechanism for Python. - -The lock includes a lock counter and is thread safe. This means, when locking -the same lock object twice, it will not block. -%endif # with_python3_other %prep %autosetup -p1 -n py-%{srcname}-%{version} + %build %if 0%{?with_python2} %py2_build @@ -120,14 +84,9 @@ the same lock object twice, it will not block. %py3_build %endif # with_python3 -%if 0%{?with_python3_other} -%py3_other_build -%endif # with_python3_other - -%if 0%{?with_doc} -make -C docs html man +make -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} rm docs/build/html/.buildinfo -%endif # with_doc + %install %if 0%{?with_python2} @@ -138,15 +97,9 @@ rm docs/build/html/.buildinfo %py3_install %endif # with_python3 -%if 0%{?with_python3_other} -%py3_other_install -%endif # with_python3_other - -%if 0%{?with_doc} install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/py-%{srcname}.1 -%endif # with_doc -%if 0%{?with_tests} + %check %if 0%{?with_python2} %{__python2} test.py @@ -156,54 +109,37 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{__python3} test.py %endif # with_python3 -%if 0%{?with_python3_other} -%{__python3_other} test.py -%endif # with_python3_other -%endif # with_tests -%if 0%{?with_doc} %files doc -%license LICENSE.rst +%license LICENSE %doc docs/build/html -%endif # with_doc %if 0%{?with_python2} %files -n python2-%{srcname} -%license LICENSE.rst -%doc README.rst +%license LICENSE +%doc README.md %{python2_sitelib}/%{srcname}.py %{python2_sitelib}/%{srcname}.py[co] %{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info -%if 0%{?with_doc} %{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_doc %endif # with_python2 %if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{srcname} -%license LICENSE.rst -%doc README.rst +%license LICENSE +%doc README.md %{python3_sitelib}/%{srcname}.py %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/__pycache__/%{srcname}*.py[co] -%if 0%{?with_doc} %{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_doc %endif # with_python3 -%if 0%{?with_python3_other} -%files -n python%{python3_other_pkgversion}-%{srcname} -%license LICENSE.rst -%doc README.rst -%{python3_other_sitelib}/%{srcname}.py -%{python3_other_sitelib}/%{srcname}-%{version}-py%{python3_other_version}.egg-info -%{python3_other_sitelib}/__pycache__/%{srcname}*.py[co] -%if 0%{?with_doc} -%{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_doc -%endif # with_python3_other %changelog +* Sun May 19 2019 Scott K Logan - 3.0.12-1 +- Update to 3.0.12 (rhbz#1711583) +- Switch to Python 3 sphinx + * Sat Feb 02 2019 Fedora Release Engineering - 3.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 5e49e13..ab81ec4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (py-filelock-3.0.10.tar.gz) = 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef +SHA512 (py-filelock-3.0.12.tar.gz) = 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683