From fca7c9d582ae2c927c9420a028c5db4cfac8bf3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 19 Sep 2016 12:54:10 +0000 Subject: [PATCH 01/39] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From f8531d3f56cdad6dfbb6aac1f401876b86fa4e71 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 20 Sep 2016 23:57:12 -0700 Subject: [PATCH 02/39] Initial package --- .gitignore | 1 + python-filelock.spec | 117 +++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 119 insertions(+) create mode 100644 python-filelock.spec diff --git a/.gitignore b/.gitignore index e69de29..f630575 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/filelock-fde6c13.tar.gz diff --git a/python-filelock.spec b/python-filelock.spec new file mode 100644 index 0000000..0d4d41e --- /dev/null +++ b/python-filelock.spec @@ -0,0 +1,117 @@ +%global commit fde6c13718dd98ca50a9e3378f972706035b57c6 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global srcname filelock +%global sum A platform independent file lock + +Name: python-%{srcname} +Version: 2.0.6 +Release: 1%{?dist} +Summary: %{sum} + +Group: Development/Libraries +License: Unlicense +URL: https://github.com/benediktschmitt/py-%{srcname} +Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/%{commit}.tar.gz#/%{srcname}-%{shortcommit}.tar.gz + +BuildArch: noarch + +%description +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. + +%package doc +Summary: Documentation for %{srcname}, %{sum} +BuildRequires: python-sphinx +BuildRequires: python-sphinx_rtd_theme +Requires: fontawesome-fonts +Requires: google-roboto-slab-fonts +Requires: lato-fonts + +%description doc +Documentation for %{srcname}, %{sum} + +%package -n python2-%{srcname} +Summary: %{sum} +BuildRequires: python2-devel +%{?python_provide:%python_provide python2-%{srcname}} +Recommends: %{name}-doc + +%description -n python2-%{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. + +%package -n python3-%{srcname} +Summary: %{sum} +BuildRequires: python3-devel +%{?python_provide:%python_provide python3-%{srcname}} +Recommends: %{name}-doc + +%description -n python3-%{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. + +%prep +%autosetup -n py-%{srcname}-%{commit} + +sed -i '1{\@^#!/usr/bin/python@d}' %{srcname}.py + +%build +%py2_build +%py3_build + +make -C docs html man +rm docs/build/html/.buildinfo + +# Unbundle fonts +ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.eot docs/build/html/_static/fonts/fontawesome-webfont.eot +ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.svg docs/build/html/_static/fonts/fontawesome-webfont.svg +ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf docs/build/html/_static/fonts/fontawesome-webfont.ttf +ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff docs/build/html/_static/fonts/fontawesome-webfont.woff +ln -sf %{_datadir}/fonts/google-roboto-slab/RobotoSlab-Bold.ttf docs/build/html/_static/fonts/RobotoSlab-Bold.ttf +ln -sf %{_datadir}/fonts/google-roboto-slab/RobotoSlab-Regular.ttf docs/build/html/_static/fonts/RobotoSlab-Regular.ttf +ln -sf %{_datadir}/fonts/lato/Lato-Bold.ttf docs/build/html/_static/fonts/Lato-Bold.ttf +ln -sf %{_datadir}/fonts/lato/Lato-Regular.ttf docs/build/html/_static/fonts/Lato-Regular.ttf + +%install +%py2_install +%py3_install + +install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/py-%{srcname}.1 +rm %{buildroot}%{_prefix}/LICENSE.rst %{buildroot}%{_prefix}/README.rst + +%check +%{__python2} test.py +%{__python3} test.py + +%files doc +%doc docs/build/html +%license LICENSE.rst + +%files -n python2-%{srcname} +%doc README.rst +%license LICENSE.rst +%{_mandir}/man1/py-%{srcname}.1.gz +%{python2_sitelib}/%{srcname}.py +%{python2_sitelib}/%{srcname}.py[co] +%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info + +%files -n python3-%{srcname} +%doc README.rst +%license LICENSE.rst +%{_mandir}/man1/py-%{srcname}.1.gz +%{python3_sitelib}/%{srcname}.py +%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info +%{python3_sitelib}/__pycache__/%{srcname}*.py[co] + +%changelog +* Sun May 01 2016 Scott K Logan - 2.0.6-1 +- Initial package diff --git a/sources b/sources index e69de29..dfc6f95 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2f3a75f6001be4dbc52e9c535c85167d filelock-fde6c13.tar.gz From 90b5d2b183d59306c0c0868d29ebdf435641a326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:37 +0100 Subject: [PATCH 03/39] Rebuild for Python 3.6 --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 0d4d41e..d57ad71 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} Group: Development/Libraries @@ -113,5 +113,8 @@ rm %{buildroot}%{_prefix}/LICENSE.rst %{buildroot}%{_prefix}/README.rst %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Mon Dec 19 2016 Miro Hrončok - 2.0.6-2 +- Rebuild for Python 3.6 + * Sun May 01 2016 Scott K Logan - 2.0.6-1 - Initial package From 7b06432c10f3617cf11fe1c6bc0b62346eeaec66 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Sat, 4 Feb 2017 16:36:28 -0800 Subject: [PATCH 04/39] Update to version 2.0.8 --- .gitignore | 1 + python-filelock.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f630575..23e2dce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /filelock-fde6c13.tar.gz +/filelock-252a308.tar.gz diff --git a/python-filelock.spec b/python-filelock.spec index d57ad71..d72d9df 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,11 +1,11 @@ -%global commit fde6c13718dd98ca50a9e3378f972706035b57c6 +%global commit 252a308f2844f16f9ad77fd5a4e9da4c3f5f4c3c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname filelock %global sum A platform independent file lock Name: python-%{srcname} -Version: 2.0.6 -Release: 2%{?dist} +Version: 2.0.8 +Release: 1%{?dist} Summary: %{sum} Group: Development/Libraries @@ -86,7 +86,6 @@ ln -sf %{_datadir}/fonts/lato/Lato-Regular.ttf docs/build/html/_static/fonts/Lat %py3_install install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/py-%{srcname}.1 -rm %{buildroot}%{_prefix}/LICENSE.rst %{buildroot}%{_prefix}/README.rst %check %{__python2} test.py @@ -113,6 +112,9 @@ rm %{buildroot}%{_prefix}/LICENSE.rst %{buildroot}%{_prefix}/README.rst %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Sat Feb 04 2017 Scott K Logan - 2.0.8-1 +- Update to version 2.0.8 + * Mon Dec 19 2016 Miro Hrončok - 2.0.6-2 - Rebuild for Python 3.6 diff --git a/sources b/sources index dfc6f95..4f305d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f3a75f6001be4dbc52e9c535c85167d filelock-fde6c13.tar.gz +SHA512 (filelock-252a308.tar.gz) = ef33a9ed159f9161feec773aeae0df87bce8e5eb89e70e0b930f60d77e0cbcbebd02ab1abe9563aac4b9eed8af9f2a236b075d734d73f6e7b5c8864095063a4c From a3700e7f59e8d35fa04b780a19b2032d7fcf3d63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 09:00:30 +0000 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index d72d9df..05a8512 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} Group: Development/Libraries @@ -112,6 +112,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Feb 04 2017 Scott K Logan - 2.0.8-1 - Update to version 2.0.8 From 1ba16f237748f025c1b58c662655c28db6273c5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 10:18:45 +0000 Subject: [PATCH 06/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 05a8512..66305c3 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} Group: Development/Libraries @@ -112,6 +112,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 455d4503a6709b124a9b18ab782226e05d09a2bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 07:49:36 +0000 Subject: [PATCH 07/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 66305c3..fd0e79e 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} Group: Development/Libraries @@ -112,6 +112,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 12417af11ef208c9a024fd027cd90ecebe385659 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 12 Feb 2018 02:39:13 +0100 Subject: [PATCH 08/39] Update Python 2 dependency declarations to new packaging standards --- python-filelock.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-filelock.spec b/python-filelock.spec index fd0e79e..7229e18 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} Group: Development/Libraries @@ -24,8 +24,8 @@ the same lock object twice, it will not block. %package doc Summary: Documentation for %{srcname}, %{sum} -BuildRequires: python-sphinx -BuildRequires: python-sphinx_rtd_theme +BuildRequires: python2-sphinx +BuildRequires: python2-sphinx_rtd_theme Requires: fontawesome-fonts Requires: google-roboto-slab-fonts Requires: lato-fonts @@ -112,6 +112,10 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Mon Feb 12 2018 Iryna Shcherbina - 2.0.8-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 2.0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 861dff04a2164845d955ddd24ec1929cc7521103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:01:40 +0200 Subject: [PATCH 09/39] Rebuilt for Python 3.7 --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 7229e18..0f1fb00 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} Group: Development/Libraries @@ -112,6 +112,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Tue Jun 19 2018 Miro Hrončok - 2.0.8-6 +- Rebuilt for Python 3.7 + * Mon Feb 12 2018 Iryna Shcherbina - 2.0.8-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From c01a1bbb7e73e70eca5529cf34673d02e9e1e7b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 00:14:09 +0000 Subject: [PATCH 10/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 0f1fb00..8bbd62a 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} Group: Development/Libraries @@ -112,6 +112,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 2.0.8-6 - Rebuilt for Python 3.7 From 4fa0b65780ebc17dff36489aa7d65ba14ed64fc0 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 14 Sep 2018 16:00:51 -0700 Subject: [PATCH 11/39] Update to 3.0.8 (rhbz#1459712) --- .gitignore | 1 + python-filelock.spec | 28 +++++++++------------------- sources | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 23e2dce..3d084a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /filelock-fde6c13.tar.gz /filelock-252a308.tar.gz +/python-filelock-0980867.tar.gz diff --git a/python-filelock.spec b/python-filelock.spec index 8bbd62a..522b6b9 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,17 +1,17 @@ -%global commit 252a308f2844f16f9ad77fd5a4e9da4c3f5f4c3c +%global commit 0980867d17db4a3e1b20d588b680582cbbf7e778 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname filelock %global sum A platform independent file lock Name: python-%{srcname} -Version: 2.0.8 -Release: 7%{?dist} +Version: 3.0.8 +Release: 1%{?dist} Summary: %{sum} Group: Development/Libraries License: Unlicense URL: https://github.com/benediktschmitt/py-%{srcname} -Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/%{commit}.tar.gz#/%{srcname}-%{shortcommit}.tar.gz +Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz BuildArch: noarch @@ -26,9 +26,6 @@ the same lock object twice, it will not block. Summary: Documentation for %{srcname}, %{sum} BuildRequires: python2-sphinx BuildRequires: python2-sphinx_rtd_theme -Requires: fontawesome-fonts -Requires: google-roboto-slab-fonts -Requires: lato-fonts %description doc Documentation for %{srcname}, %{sum} @@ -62,25 +59,15 @@ the same lock object twice, it will not block. %prep %autosetup -n py-%{srcname}-%{commit} -sed -i '1{\@^#!/usr/bin/python@d}' %{srcname}.py +sed -i '1{s|^#!\(/usr/bin/\(env \)\?\)\?python||}' %{srcname}.py %build %py2_build %py3_build -make -C docs html man +make -C docs html man SPHINXBUILD=sphinx-build-2 rm docs/build/html/.buildinfo -# Unbundle fonts -ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.eot docs/build/html/_static/fonts/fontawesome-webfont.eot -ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.svg docs/build/html/_static/fonts/fontawesome-webfont.svg -ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf docs/build/html/_static/fonts/fontawesome-webfont.ttf -ln -sf %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff docs/build/html/_static/fonts/fontawesome-webfont.woff -ln -sf %{_datadir}/fonts/google-roboto-slab/RobotoSlab-Bold.ttf docs/build/html/_static/fonts/RobotoSlab-Bold.ttf -ln -sf %{_datadir}/fonts/google-roboto-slab/RobotoSlab-Regular.ttf docs/build/html/_static/fonts/RobotoSlab-Regular.ttf -ln -sf %{_datadir}/fonts/lato/Lato-Bold.ttf docs/build/html/_static/fonts/Lato-Bold.ttf -ln -sf %{_datadir}/fonts/lato/Lato-Regular.ttf docs/build/html/_static/fonts/Lato-Regular.ttf - %install %py2_install %py3_install @@ -112,6 +99,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/__pycache__/%{srcname}*.py[co] %changelog +* Fri Sep 14 2018 Scott K Logan - 3.0.8-1 +- Update to 3.0.8 (rhbz#1459712) + * Sat Jul 14 2018 Fedora Release Engineering - 2.0.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 4f305d5..ddf3b1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (filelock-252a308.tar.gz) = ef33a9ed159f9161feec773aeae0df87bce8e5eb89e70e0b930f60d77e0cbcbebd02ab1abe9563aac4b9eed8af9f2a236b075d734d73f6e7b5c8864095063a4c +SHA512 (python-filelock-0980867.tar.gz) = bfaca9b50c27f392920c99f217f6a17688c43ca1f407a985365435fd35573b6d935dc09b7905d9272b5142b26cdc54e220d9b5d99b019da65033b81d179af7a5 From a3bcda8c666d67fb74129067613057740873faf8 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 30 Oct 2018 14:33:29 -0700 Subject: [PATCH 12/39] Update to 3.0.9 - Add spec conditionals for python version targeting (rhbz#1632320) - Fix theme package dependency (s/sphinx_rtd_theme/sphinx-theme-alabaster/) --- .gitignore | 1 + python-filelock.spec | 138 +++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 129 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 3d084a6..8344345 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /filelock-fde6c13.tar.gz /filelock-252a308.tar.gz /python-filelock-0980867.tar.gz +/python-filelock-b71c3a4.tar.gz diff --git a/python-filelock.spec b/python-filelock.spec index 522b6b9..298e2d3 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,10 +1,16 @@ -%global commit 0980867d17db4a3e1b20d588b680582cbbf7e778 +%{?!_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 commit b71c3a494b1a9a84ddaa4a4d43bfd985a01e81e7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname filelock %global sum A platform independent file lock Name: python-%{srcname} -Version: 3.0.8 +Version: 3.0.9 Release: 1%{?dist} Summary: %{sum} @@ -22,19 +28,37 @@ 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}, %{sum} + +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: python2-sphinx -BuildRequires: python2-sphinx_rtd_theme +BuildRequires: python2-sphinx-theme-alabaster +%else # rhel +BuildRequires: python%{python3_pkgversion}-sphinx +BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster +%endif # rhel %description doc Documentation for %{srcname}, %{sum} +%endif # with_doc +%if 0%{?with_python2} %package -n python2-%{srcname} Summary: %{sum} + BuildRequires: python2-devel +BuildRequires: python2-setuptools + +%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 @@ -42,19 +66,51 @@ 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_python2 + +%if 0%{?with_python3} +%package -n python%{python3_pkgversion}-%{srcname} +Summary: %{sum} + +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools + +%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} +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 -%package -n python3-%{srcname} +%if 0%{?with_python3_other} +%package -n python%{python3_other_pkgversion}-%{srcname} Summary: %{sum} -BuildRequires: python3-devel -%{?python_provide:%python_provide python3-%{srcname}} + +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 python3-%{srcname} +%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 -n py-%{srcname}-%{commit} @@ -62,43 +118,103 @@ the same lock object twice, it will not block. sed -i '1{s|^#!\(/usr/bin/\(env \)\?\)\?python||}' %{srcname}.py %build +%if 0%{?with_python2} %py2_build +%endif # with_python2 + +%if 0%{?with_python3} %py3_build +%endif # with_python3 -make -C docs html man SPHINXBUILD=sphinx-build-2 +%if 0%{?with_python3_other} +%py3_other_build +%endif # with_python3_other + +%if 0%{?with_doc} +make -C docs html man rm docs/build/html/.buildinfo +%endif # with_doc %install +%if 0%{?with_python2} %py2_install +%endif # with_python2 + +%if 0%{?with_python3} %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 +%endif # with_python2 + +%if 0%{?with_python3} %{__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 %doc docs/build/html %license LICENSE.rst +%endif # with_doc +%if 0%{?with_python2} %files -n python2-%{srcname} %doc README.rst %license LICENSE.rst +%if 0%{?with_doc} %{_mandir}/man1/py-%{srcname}.1.gz +%endif # with_doc %{python2_sitelib}/%{srcname}.py %{python2_sitelib}/%{srcname}.py[co] -%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info +%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info +%endif # with_python2 -%files -n python3-%{srcname} +%if 0%{?with_python3} +%files -n python%{python3_pkgversion}-%{srcname} %doc README.rst %license LICENSE.rst +%if 0%{?with_doc} %{_mandir}/man1/py-%{srcname}.1.gz +%endif # with_doc %{python3_sitelib}/%{srcname}.py -%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/__pycache__/%{srcname}*.py[co] +%endif # with_python3 + +%if 0%{?with_python3_other} +%files -n python%{python3_other_pkgversion}-%{srcname} +%doc README.rst +%license LICENSE.rst +%if 0%{?with_doc} +%{_mandir}/man1/py-%{srcname}.1.gz +%endif # with_doc +%{python3_other_sitelib}/%{srcname}.py +%{python3_other_sitelib}/%{srcname}-%{version}-py%{python3_other_version}.egg-info +%{python3_other_sitelib}/__pycache__/%{srcname}*.py[co] +%endif # with_python3_other %changelog +* Tue Oct 30 2018 Scott K Logan - 3.0.9-1 +- Update to 3.0.9 +- Add spec conditionals for python version targeting (rhbz#1632320) +- Fix theme package dependency (s/sphinx_rtd_theme/sphinx-theme-alabaster/) + * Fri Sep 14 2018 Scott K Logan - 3.0.8-1 - Update to 3.0.8 (rhbz#1459712) diff --git a/sources b/sources index ddf3b1c..71af084 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-filelock-0980867.tar.gz) = bfaca9b50c27f392920c99f217f6a17688c43ca1f407a985365435fd35573b6d935dc09b7905d9272b5142b26cdc54e220d9b5d99b019da65033b81d179af7a5 +SHA512 (python-filelock-b71c3a4.tar.gz) = bf2c3a27488e4e0b0469599c5037658482b27eee08ef1844de5419865a67f01966b72f1f463ce7418660901c991ad06740a90f332db0b2d3d62967f0f270aba9 From 65c2dd0f0bb4d57a7dbb8b8f9e1b2848ecfce9fc Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 16 Nov 2018 00:23:30 -0800 Subject: [PATCH 13/39] Update to 3.0.10 --- .gitignore | 1 + python-filelock.rpmlintrc | 3 ++ python-filelock.spec | 62 +++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 35 insertions(+), 33 deletions(-) create mode 100644 python-filelock.rpmlintrc diff --git a/.gitignore b/.gitignore index 8344345..25c4727 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /filelock-252a308.tar.gz /python-filelock-0980867.tar.gz /python-filelock-b71c3a4.tar.gz +/py-filelock-3.0.10.tar.gz diff --git a/python-filelock.rpmlintrc b/python-filelock.rpmlintrc new file mode 100644 index 0000000..3d66932 --- /dev/null +++ b/python-filelock.rpmlintrc @@ -0,0 +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') diff --git a/python-filelock.spec b/python-filelock.spec index 298e2d3..5c1a144 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,23 +1,20 @@ %{?!_without_doc:%global with_doc 1} -%{?!_without_python2:%global with_python2 0%{?_with_python2:1} || (0%{?fedora} < 30 && 0%{?rhel} < 8)} +%{?!_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 commit b71c3a494b1a9a84ddaa4a4d43bfd985a01e81e7 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname filelock -%global sum A platform independent file lock Name: python-%{srcname} -Version: 3.0.9 +Version: 3.0.10 Release: 1%{?dist} -Summary: %{sum} +Summary: A platform independent file lock Group: Development/Libraries License: Unlicense URL: https://github.com/benediktschmitt/py-%{srcname} -Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/v%{version}/py-%{srcname}-%{version}.tar.gz BuildArch: noarch @@ -30,23 +27,23 @@ the same lock object twice, it will not block. %if 0%{?with_doc} %package doc -Summary: Documentation for %{srcname}, %{sum} +Summary: Documentation for %{srcname}, %{summary} -%if 0%{?rhel} && 0%{?rhel} < 8 -BuildRequires: python2-sphinx -BuildRequires: python2-sphinx-theme-alabaster -%else # rhel +%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 -Documentation for %{srcname}, %{sum} +%{summary} %endif # with_doc %if 0%{?with_python2} %package -n python2-%{srcname} -Summary: %{sum} +Summary: %{summary} BuildRequires: python2-devel BuildRequires: python2-setuptools @@ -70,7 +67,7 @@ the same lock object twice, it will not block. %if 0%{?with_python3} %package -n python%{python3_pkgversion}-%{srcname} -Summary: %{sum} +Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools @@ -92,7 +89,7 @@ the same lock object twice, it will not block. %if 0%{?with_python3_other} %package -n python%{python3_other_pkgversion}-%{srcname} -Summary: %{sum} +Summary: %{summary} BuildRequires: python%{python3_other_pkgversion}-devel BuildRequires: python%{python3_other_pkgversion}-setuptools @@ -113,9 +110,7 @@ the same lock object twice, it will not block. %endif # with_python3_other %prep -%autosetup -n py-%{srcname}-%{commit} - -sed -i '1{s|^#!\(/usr/bin/\(env \)\?\)\?python||}' %{srcname}.py +%autosetup -p1 -n py-%{srcname}-%{version} %build %if 0%{?with_python2} @@ -169,47 +164,50 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %if 0%{?with_doc} %files doc -%doc docs/build/html %license LICENSE.rst +%doc docs/build/html %endif # with_doc %if 0%{?with_python2} %files -n python2-%{srcname} -%doc README.rst %license LICENSE.rst -%if 0%{?with_doc} -%{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_doc +%doc README.rst %{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} -%doc README.rst %license LICENSE.rst -%if 0%{?with_doc} -%{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_doc +%doc README.rst %{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} -%doc README.rst %license LICENSE.rst -%if 0%{?with_doc} -%{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_doc +%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 +* Fri Nov 16 2018 Scott K Logan - 3.0.10-1 +- Update to 3.0.10 + * Tue Oct 30 2018 Scott K Logan - 3.0.9-1 - Update to 3.0.9 - Add spec conditionals for python version targeting (rhbz#1632320) diff --git a/sources b/sources index 71af084..5e49e13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-filelock-b71c3a4.tar.gz) = bf2c3a27488e4e0b0469599c5037658482b27eee08ef1844de5419865a67f01966b72f1f463ce7418660901c991ad06740a90f332db0b2d3d62967f0f270aba9 +SHA512 (py-filelock-3.0.10.tar.gz) = 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef From 0b0811843d06a8acb1c3796df51c8918bc75ff42 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:15 +0100 Subject: [PATCH 14/39] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- python-filelock.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 5c1a144..9aac255 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -11,7 +11,6 @@ Version: 3.0.10 Release: 1%{?dist} Summary: A platform independent file lock -Group: Development/Libraries License: Unlicense URL: https://github.com/benediktschmitt/py-%{srcname} Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/v%{version}/py-%{srcname}-%{version}.tar.gz From 8e6e65582b31d46e9b5ca5cbc3a00b29a2e11f0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 06:43:41 +0000 Subject: [PATCH 15/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 9aac255..926a780 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -8,7 +8,7 @@ Name: python-%{srcname} Version: 3.0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A platform independent file lock License: Unlicense @@ -204,6 +204,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %endif # with_python3_other %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Nov 16 2018 Scott K Logan - 3.0.10-1 - Update to 3.0.10 From 554f2de91fee2382eebd716e3598f3210e797c19 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Sun, 19 May 2019 16:33:51 -0700 Subject: [PATCH 16/39] 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 From 4e59779e7f624d1de76b6094928f6dede5547a42 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 28 Jun 2019 11:11:20 -0700 Subject: [PATCH 17/39] Add explicit conflict between unlike python2/3 subpackages Also: - Make the -doc subpackage dependency weaker --- python-filelock.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/python-filelock.spec b/python-filelock.spec index 60d7745..faa8238 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A platform independent file lock License: Unlicense @@ -36,10 +36,11 @@ BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster Summary: %{summary} BuildRequires: python2-devel BuildRequires: python2-setuptools +Conflicts: python%{python3_pkgversion}-%{srcname} < %{version}-%{release} %{?python_provide:%python_provide python2-%{srcname}} %if 0%{?fedora} -Recommends: %{name}-doc +Suggests: %{name}-doc %endif # with_doc %description -n python2-%{srcname} @@ -56,10 +57,11 @@ the same lock object twice, it will not block. Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +Conflicts: python2-%{srcname} < %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} %if 0%{?fedora} -Recommends: %{name}-doc +Suggests: %{name}-doc %endif # fedora %description -n python%{python3_pkgversion}-%{srcname} @@ -84,7 +86,7 @@ the same lock object twice, it will not block. %py3_build %endif # with_python3 -make -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} +%make_build -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} rm docs/build/html/.buildinfo @@ -136,6 +138,10 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Jun 28 2019 Scott K Logan - 3.0.12-2 +- Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) +- Make the -doc subpackage dependency weaker + * Sun May 19 2019 Scott K Logan - 3.0.12-1 - Update to 3.0.12 (rhbz#1711583) - Switch to Python 3 sphinx From 7307ee790e0993494b9a2d322f9f7dd7cdb16845 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 13:25:36 +0000 Subject: [PATCH 18/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index faa8238..c0dda23 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A platform independent file lock License: Unlicense @@ -138,6 +138,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 28 2019 Scott K Logan - 3.0.12-2 - Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) - Make the -doc subpackage dependency weaker From d7669bc35f341329dee7ecdf71b4fbbb045c3807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 17 Aug 2019 14:15:45 +0200 Subject: [PATCH 19/39] Rebuilt for Python 3.8 --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index c0dda23..47a7195 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A platform independent file lock License: Unlicense @@ -138,6 +138,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat Aug 17 2019 Miro Hrončok - 3.0.12-4 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 3.0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a98ffe5122ea7a4481004fcc80e6bd4da4d643d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:11:27 +0200 Subject: [PATCH 20/39] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 47a7195..222f70c 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A platform independent file lock License: Unlicense @@ -138,6 +138,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Thu Oct 03 2019 Miro Hrončok - 3.0.12-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Sat Aug 17 2019 Miro Hrončok - 3.0.12-4 - Rebuilt for Python 3.8 From 5c878933a89edc2c7d6f5b6a8f67f830f7df3ff7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 12:07:08 +0000 Subject: [PATCH 21/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 222f70c..463dc49 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A platform independent file lock License: Unlicense @@ -138,6 +138,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 3.0.12-5 - Rebuilt for Python 3.8.0rc1 (#1748018) From 123fed8796bd83baee1de00f27dcc9312e66e5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 20:57:58 +0200 Subject: [PATCH 22/39] Rebuilt for Python 3.9 --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 463dc49..99d14b1 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A platform independent file lock License: Unlicense @@ -138,6 +138,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Sat May 23 2020 Miro Hrončok - 3.0.12-7 +- Rebuilt for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 3.0.12-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 21aae09680f0d68e2e1b49d839453b62f7c3e484 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 00:59:46 +0000 Subject: [PATCH 23/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 99d14b1..a862877 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A platform independent file lock License: Unlicense @@ -138,6 +138,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat May 23 2020 Miro Hrončok - 3.0.12-7 - Rebuilt for Python 3.9 From f4c57e36092a7acd79c5b3a74f21bc0cface2070 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 19:49:18 +0000 Subject: [PATCH 24/39] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- python-filelock.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-filelock.spec b/python-filelock.spec index a862877..46a7d1e 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -24,6 +24,7 @@ the same lock object twice, it will not block. %package doc Summary: Documentation for %{srcname}, %{summary} +BuildRequires: make BuildRequires: python%{python3_pkgversion}-sphinx BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster From 0ab93cf076658896a29ea65a5c823a75e236bdb5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 10:37:32 +0000 Subject: [PATCH 25/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 46a7d1e..52eb53e 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A platform independent file lock License: Unlicense @@ -139,6 +139,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.0.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9bb6780123522a64c43fb556e1f7c2a61759d269 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Wed, 12 May 2021 11:21:44 +0200 Subject: [PATCH 26/39] Add bcond to build filelock without docs --- python-filelock.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 52eb53e..7d704c8 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -21,7 +21,8 @@ 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. - +%bcond_without docs +%if %{with docs} %package doc Summary: Documentation for %{srcname}, %{summary} BuildRequires: make @@ -30,6 +31,7 @@ BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster %description doc %{summary} +%endif %if 0%{?with_python2} @@ -87,8 +89,10 @@ the same lock object twice, it will not block. %py3_build %endif # with_python3 +%if %{with docs} %make_build -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} rm docs/build/html/.buildinfo +%endif %install @@ -100,7 +104,9 @@ rm docs/build/html/.buildinfo %py3_install %endif # with_python3 +%if %{with docs} install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/py-%{srcname}.1 +%endif %check @@ -113,9 +119,11 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %endif # with_python3 +%if %{with docs} %files doc %license LICENSE %doc docs/build/html +%endif %if 0%{?with_python2} %files -n python2-%{srcname} @@ -134,7 +142,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/%{srcname}.py %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/__pycache__/%{srcname}*.py[co] +%if %{with docs} %{_mandir}/man1/py-%{srcname}.1.gz +%endif %endif # with_python3 From 253a0f06fcd337cf55c6876e1b1574918e425a94 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 14:16:55 +0200 Subject: [PATCH 27/39] Bootstrap for Python 3.10 --- python-filelock.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 7d704c8..f23640b 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,3 +1,4 @@ +%global _without_docs 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} @@ -5,7 +6,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A platform independent file lock License: Unlicense @@ -149,6 +150,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Wed Jun 02 2021 Python Maint - 3.0.12-10 +- Bootstrap for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 3.0.12-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e887f8aed72b587fb661157412b7cc2ee54e342b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 19:44:06 +0200 Subject: [PATCH 28/39] Rebuilt for Python 3.10 --- python-filelock.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-filelock.spec b/python-filelock.spec index f23640b..6baaff2 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,4 +1,3 @@ -%global _without_docs 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} @@ -6,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A platform independent file lock License: Unlicense @@ -150,6 +149,9 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Jun 04 2021 Python Maint - 3.0.12-11 +- Rebuilt for Python 3.10 + * Wed Jun 02 2021 Python Maint - 3.0.12-10 - Bootstrap for Python 3.10 From 27d78c8d91c14b73dd43a0dd21d09a5936c6e379 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 27 Jul 2021 08:12:15 +0000 Subject: [PATCH 29/39] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 6baaff2..784bd36 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A platform independent file lock License: Unlicense @@ -149,6 +149,10 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Tue Jul 27 2021 Fedora Release Engineering - 3.0.12-12 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 3.0.12-11 - Rebuilt for Python 3.10 From 3ba97dda98745be145a6e844c07f332a6e6677ec Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 25 Oct 2021 13:11:05 +0200 Subject: [PATCH 30/39] Update to 3.3.1, drop Python 2 support --- .gitignore | 2 + python-filelock.spec | 126 ++++++++++++++----------------------------- sources | 2 +- 3 files changed, 43 insertions(+), 87 deletions(-) diff --git a/.gitignore b/.gitignore index 700b112..eb377fa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /python-filelock-b71c3a4.tar.gz /py-filelock-3.0.10.tar.gz /py-filelock-3.0.12.tar.gz +/py-filelock-3.3.1.tar.gz +/filelock-3.3.1.tar.gz diff --git a/python-filelock.spec b/python-filelock.spec index 784bd36..4d80115 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,19 +1,30 @@ -%{?!_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} - %global srcname filelock +%bcond_without docs Name: python-%{srcname} -Version: 3.0.12 -Release: 12%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: A platform independent file lock License: Unlicense -URL: https://github.com/benediktschmitt/py-%{srcname} -Source0: https://github.com/benediktschmitt/py-%{srcname}/archive/v%{version}/py-%{srcname}-%{version}.tar.gz +URL: https://github.com/tox-dev/py-%{srcname} +Source0: %{pypi_source %{srcname}} BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros +# We cannot install extra dependencies because there are some +# we do not have in Fedora like covdefaults in testing or furo in docs. +# Test dependencies +BuildRequires: python3-pytest +BuildRequires: python3-pytest-timeout +%if %{with docs} +# Doc dependencies +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx-autodoc-typehints +%endif + %description This package contains a single module, which implements a platform independent file locking mechanism for Python. @@ -21,47 +32,16 @@ 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. -%bcond_without docs %if %{with docs} %package doc Summary: Documentation for %{srcname}, %{summary} -BuildRequires: make -BuildRequires: python%{python3_pkgversion}-sphinx -BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster %description doc %{summary} %endif - -%if 0%{?with_python2} -%package -n python2-%{srcname} -Summary: %{summary} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -Conflicts: python%{python3_pkgversion}-%{srcname} < %{version}-%{release} -%{?python_provide:%python_provide python2-%{srcname}} - -%if 0%{?fedora} -Suggests: %{name}-doc -%endif # with_doc - -%description -n python2-%{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_python2 - - -%if 0%{?with_python3} %package -n python%{python3_pkgversion}-%{srcname} Summary: %{summary} -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools -Conflicts: python2-%{srcname} < %{version}-%{release} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} %if 0%{?fedora} Suggests: %{name}-doc @@ -73,82 +53,56 @@ 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 - %prep -%autosetup -p1 -n py-%{srcname}-%{version} +%autosetup -n %{srcname}-%{version} +# furo theme is not available in Fedora +sed -i "/html_theme =.*/d" docs/conf.py +%generate_buildrequires +%pyproject_buildrequires -r %build -%if 0%{?with_python2} -%py2_build -%endif # with_python2 - -%if 0%{?with_python3} -%py3_build -%endif # with_python3 +%pyproject_wheel %if %{with docs} -%make_build -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} -rm docs/build/html/.buildinfo +pushd docs +PYTHONPATH=../src sphinx-build ./ html --color -b html +PYTHONPATH=../src sphinx-build ./ man --color -b man +rm html/.buildinfo +popd %endif - %install -%if 0%{?with_python2} -%py2_install -%endif # with_python2 - -%if 0%{?with_python3} -%py3_install -%endif # with_python3 +%pyproject_install +%pyproject_save_files %{srcname} %if %{with docs} -install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/py-%{srcname}.1 +install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname}.1 %endif - %check -%if 0%{?with_python2} -%{__python2} test.py -%endif # with_python2 - -%if 0%{?with_python3} -%{__python3} test.py -%endif # with_python3 - +%pytest %if %{with docs} %files doc %license LICENSE -%doc docs/build/html +%doc docs/html %endif -%if 0%{?with_python2} -%files -n python2-%{srcname} +%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files} %license LICENSE %doc README.md -%{python2_sitelib}/%{srcname}.py -%{python2_sitelib}/%{srcname}.py[co] -%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info -%{_mandir}/man1/py-%{srcname}.1.gz -%endif # with_python2 - -%if 0%{?with_python3} -%files -n python%{python3_pkgversion}-%{srcname} -%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 %{with docs} -%{_mandir}/man1/py-%{srcname}.1.gz +%{_mandir}/man1/%{srcname}.1.gz %endif -%endif # with_python3 %changelog +* Mon Oct 25 2021 Lumír Balhar - 3.3.1-1 +- Update to 3.3.1, drop Python 2 support +Resolves: rhbz#2008102 + * Tue Jul 27 2021 Fedora Release Engineering - 3.0.12-12 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index ab81ec4..5e2daa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (py-filelock-3.0.12.tar.gz) = 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683 +SHA512 (filelock-3.3.1.tar.gz) = d62903a7a2c344e6a89863254392a389b893ec0c97fc4d5b0073c7a6597df6a85e00ce30022bb55886e9d30ba163457bc3a641f083ccb2bdd62431f3cf5c2cf1 From 97db3163e168c333fbe7b2009a64823d499c5d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 19 Nov 2021 17:38:55 +0100 Subject: [PATCH 31/39] Allow to build on EPEL 9 Next, without docs --- python-filelock.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-filelock.spec b/python-filelock.spec index 4d80115..5c42a3b 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,5 +1,10 @@ %global srcname filelock + +%if 0%{?fedora} %bcond_without docs +%else +%bcond_with docs +%endif Name: python-%{srcname} Version: 3.3.1 From 6f211af7ec74529306b8e0e57ec1ef706b1fcdc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 12:05:47 +0000 Subject: [PATCH 32/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 5c42a3b..4b8fc98 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -8,7 +8,7 @@ Name: python-%{srcname} Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A platform independent file lock License: Unlicense @@ -104,6 +104,9 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 25 2021 Lumír Balhar - 3.3.1-1 - Update to 3.3.1, drop Python 2 support Resolves: rhbz#2008102 From 7e287890b16298f6e07ec8d5039265cb62510080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 13 Jun 2022 19:31:18 +0200 Subject: [PATCH 33/39] Introduce tests bcond for easier Python 3.N+1 bootstrap There is a giant dependency loop between pytest-{timeout,cov}, virtualenv and this. --- python-filelock.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python-filelock.spec b/python-filelock.spec index 4b8fc98..a7a992d 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,6 +5,7 @@ %else %bcond_with docs %endif +%bcond_without tests Name: python-%{srcname} Version: 3.3.1 @@ -19,11 +20,13 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: pyproject-rpm-macros +%if %{with tests} # We cannot install extra dependencies because there are some # we do not have in Fedora like covdefaults in testing or furo in docs. # Test dependencies BuildRequires: python3-pytest BuildRequires: python3-pytest-timeout +%endif %if %{with docs} # Doc dependencies BuildRequires: python3-sphinx @@ -87,7 +90,11 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %endif %check +%if %{with tests} %pytest +%else +%pyproject_check_import +%endif %if %{with docs} %files doc From 8dc69939501cac9e7e3c30a50efa0620525940bd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 19:38:14 +0200 Subject: [PATCH 34/39] Bootstrap for Python 3.11 --- python-filelock.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index a7a992d..cf5e261 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,3 +1,5 @@ +%global _without_docs 1 +%global _without_tests 1 %global srcname filelock %if 0%{?fedora} @@ -9,7 +11,7 @@ Name: python-%{srcname} Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A platform independent file lock License: Unlicense @@ -111,6 +113,9 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %changelog +* Mon Jun 13 2022 Python Maint - 3.3.1-3 +- Bootstrap for Python 3.11 + * Fri Jan 21 2022 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 189660803cf1f46b9c475d597f9191f7e1a8b451 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 22:00:29 +0200 Subject: [PATCH 35/39] Rebuilt for Python 3.11 --- python-filelock.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-filelock.spec b/python-filelock.spec index cf5e261..26ef500 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,5 +1,3 @@ -%global _without_docs 1 -%global _without_tests 1 %global srcname filelock %if 0%{?fedora} @@ -11,7 +9,7 @@ Name: python-%{srcname} Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A platform independent file lock License: Unlicense @@ -113,6 +111,9 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %changelog +* Mon Jun 13 2022 Python Maint - 3.3.1-4 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 3.3.1-3 - Bootstrap for Python 3.11 From 147d40b8469bb18f65bb41f75c55e4023ed3a708 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 18:25:37 +0000 Subject: [PATCH 36/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-filelock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-filelock.spec b/python-filelock.spec index 26ef500..7881ebc 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -9,7 +9,7 @@ Name: python-%{srcname} Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A platform independent file lock License: Unlicense @@ -111,6 +111,9 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 3.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 3.3.1-4 - Rebuilt for Python 3.11 From 192273735cb2f53bd18b18bec0f9d47077b4dc25 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Tue, 19 Jul 2022 17:01:20 +0200 Subject: [PATCH 37/39] Convert to rpmautospec --- changelog | 93 +++++++++++++++++++++++++++++++++++++++++ python-filelock.spec | 99 +------------------------------------------- 2 files changed, 95 insertions(+), 97 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..721d591 --- /dev/null +++ b/changelog @@ -0,0 +1,93 @@ +* Mon Jun 13 2022 Python Maint - 3.3.1-4 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 3.3.1-3 +- Bootstrap for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 25 2021 Lumír Balhar - 3.3.1-1 +- Update to 3.3.1, drop Python 2 support +Resolves: rhbz#2008102 + +* Tue Jul 27 2021 Fedora Release Engineering - 3.0.12-12 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 3.0.12-11 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 3.0.12-10 +- Bootstrap for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 3.0.12-7 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 3.0.12-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sat Aug 17 2019 Miro Hrončok - 3.0.12-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 28 2019 Scott K Logan - 3.0.12-2 +- Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) +- Make the -doc subpackage dependency weaker + +* 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 + +* Fri Nov 16 2018 Scott K Logan - 3.0.10-1 +- Update to 3.0.10 + +* Tue Oct 30 2018 Scott K Logan - 3.0.9-1 +- Update to 3.0.9 +- Add spec conditionals for python version targeting (rhbz#1632320) +- Fix theme package dependency (s/sphinx_rtd_theme/sphinx-theme-alabaster/) + +* Fri Sep 14 2018 Scott K Logan - 3.0.8-1 +- Update to 3.0.8 (rhbz#1459712) + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.0.8-6 +- Rebuilt for Python 3.7 + +* Mon Feb 12 2018 Iryna Shcherbina - 2.0.8-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Feb 04 2017 Scott K Logan - 2.0.8-1 +- Update to version 2.0.8 + +* Mon Dec 19 2016 Miro Hrončok - 2.0.6-2 +- Rebuild for Python 3.6 + +* Sun May 01 2016 Scott K Logan - 2.0.6-1 +- Initial package diff --git a/python-filelock.spec b/python-filelock.spec index 7881ebc..7a3b4d5 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -9,7 +9,7 @@ Name: python-%{srcname} Version: 3.3.1 -Release: 5%{?dist} +Release: %autorelease Summary: A platform independent file lock License: Unlicense @@ -111,99 +111,4 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 3.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 3.3.1-4 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 3.3.1-3 -- Bootstrap for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Oct 25 2021 Lumír Balhar - 3.3.1-1 -- Update to 3.3.1, drop Python 2 support -Resolves: rhbz#2008102 - -* Tue Jul 27 2021 Fedora Release Engineering - 3.0.12-12 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 3.0.12-11 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 3.0.12-10 -- Bootstrap for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat May 23 2020 Miro Hrončok - 3.0.12-7 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 3.0.12-5 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Sat Aug 17 2019 Miro Hrončok - 3.0.12-4 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 28 2019 Scott K Logan - 3.0.12-2 -- Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) -- Make the -doc subpackage dependency weaker - -* 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 - -* Fri Nov 16 2018 Scott K Logan - 3.0.10-1 -- Update to 3.0.10 - -* Tue Oct 30 2018 Scott K Logan - 3.0.9-1 -- Update to 3.0.9 -- Add spec conditionals for python version targeting (rhbz#1632320) -- Fix theme package dependency (s/sphinx_rtd_theme/sphinx-theme-alabaster/) - -* Fri Sep 14 2018 Scott K Logan - 3.0.8-1 -- Update to 3.0.8 (rhbz#1459712) - -* Sat Jul 14 2018 Fedora Release Engineering - 2.0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 2.0.8-6 -- Rebuilt for Python 3.7 - -* Mon Feb 12 2018 Iryna Shcherbina - 2.0.8-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Feb 04 2017 Scott K Logan - 2.0.8-1 -- Update to version 2.0.8 - -* Mon Dec 19 2016 Miro Hrončok - 2.0.6-2 -- Rebuild for Python 3.6 - -* Sun May 01 2016 Scott K Logan - 2.0.6-1 -- Initial package +%autochangelog From c6dd43caf72b1bb49bb055d62482964a4e2e06b4 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Tue, 19 Jul 2022 17:10:22 +0200 Subject: [PATCH 38/39] Update to 3.7.1 - Closes rhbz#2018436 --- .gitignore | 1 + python-filelock.spec | 22 +++++++++++----------- sources | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index eb377fa..314eb35 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /py-filelock-3.0.12.tar.gz /py-filelock-3.3.1.tar.gz /filelock-3.3.1.tar.gz +/filelock-3.7.1.tar.gz diff --git a/python-filelock.spec b/python-filelock.spec index 7a3b4d5..f9278d7 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -8,12 +8,12 @@ %bcond_without tests Name: python-%{srcname} -Version: 3.3.1 +Version: 3.7.1 Release: %autorelease Summary: A platform independent file lock License: Unlicense -URL: https://github.com/tox-dev/py-%{srcname} +URL: https://github.com/tox-dev/py-filelock Source0: %{pypi_source %{srcname}} BuildArch: noarch @@ -40,20 +40,12 @@ 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 %{with docs} -%package doc -Summary: Documentation for %{srcname}, %{summary} - -%description doc -%{summary} -%endif - %package -n python%{python3_pkgversion}-%{srcname} Summary: %{summary} %if 0%{?fedora} Suggests: %{name}-doc -%endif # fedora +%endif %description -n python%{python3_pkgversion}-%{srcname} This package contains a single module, which implements a platform independent @@ -62,6 +54,14 @@ 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 %{with docs} +%package doc +Summary: Documentation for %{srcname}, %{summary} + +%description doc +%{summary} +%endif + %prep %autosetup -n %{srcname}-%{version} # furo theme is not available in Fedora diff --git a/sources b/sources index 5e2daa1..f76bd02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (filelock-3.3.1.tar.gz) = d62903a7a2c344e6a89863254392a389b893ec0c97fc4d5b0073c7a6597df6a85e00ce30022bb55886e9d30ba163457bc3a641f083ccb2bdd62431f3cf5c2cf1 +SHA512 (filelock-3.7.1.tar.gz) = b5e0fb6c641fdf70c9a2579e233598df506a6db53de975029ccb904b30fb4dff4f5b39282f4d298d228a851de9f5c91fe642350fac737a616b16f67881c9ae13 From b1c25da112f151ca4d7ac54d6e9ea6a522cbfd1a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:52:42 +0300 Subject: [PATCH 39/39] Remove unnecessary files and fix spec-file --- changelog | 93 ------------------------------------- python-filelock.spec | 108 ++++++++++++++++++++++++++++++++++++++++++- sources | 1 - 3 files changed, 107 insertions(+), 95 deletions(-) delete mode 100644 changelog delete mode 100644 sources diff --git a/changelog b/changelog deleted file mode 100644 index 721d591..0000000 --- a/changelog +++ /dev/null @@ -1,93 +0,0 @@ -* Mon Jun 13 2022 Python Maint - 3.3.1-4 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 3.3.1-3 -- Bootstrap for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Oct 25 2021 Lumír Balhar - 3.3.1-1 -- Update to 3.3.1, drop Python 2 support -Resolves: rhbz#2008102 - -* Tue Jul 27 2021 Fedora Release Engineering - 3.0.12-12 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 3.0.12-11 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 3.0.12-10 -- Bootstrap for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat May 23 2020 Miro Hrončok - 3.0.12-7 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 3.0.12-5 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Sat Aug 17 2019 Miro Hrončok - 3.0.12-4 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 28 2019 Scott K Logan - 3.0.12-2 -- Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) -- Make the -doc subpackage dependency weaker - -* 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 - -* Fri Nov 16 2018 Scott K Logan - 3.0.10-1 -- Update to 3.0.10 - -* Tue Oct 30 2018 Scott K Logan - 3.0.9-1 -- Update to 3.0.9 -- Add spec conditionals for python version targeting (rhbz#1632320) -- Fix theme package dependency (s/sphinx_rtd_theme/sphinx-theme-alabaster/) - -* Fri Sep 14 2018 Scott K Logan - 3.0.8-1 -- Update to 3.0.8 (rhbz#1459712) - -* Sat Jul 14 2018 Fedora Release Engineering - 2.0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 2.0.8-6 -- Rebuilt for Python 3.7 - -* Mon Feb 12 2018 Iryna Shcherbina - 2.0.8-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Feb 04 2017 Scott K Logan - 2.0.8-1 -- Update to version 2.0.8 - -* Mon Dec 19 2016 Miro Hrončok - 2.0.6-2 -- Rebuild for Python 3.6 - -* Sun May 01 2016 Scott K Logan - 2.0.6-1 -- Initial package diff --git a/python-filelock.spec b/python-filelock.spec index f9278d7..339fc34 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -1,3 +1,13 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.3.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %global srcname filelock %if 0%{?fedora} @@ -111,4 +121,100 @@ install -p -m0644 -D docs/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname %changelog -%autochangelog +* Sun Aug 07 2022 Mikel Olasagasti Uranga - 3.7.1-1 +- Update to 3.7.1 - Closes rhbz#2018436 + +* Mon Jun 13 2022 Python Maint - 3.3.1-4 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 3.3.1-3 +- Bootstrap for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 25 2021 Lumír Balhar - 3.3.1-1 +- Update to 3.3.1, drop Python 2 support +Resolves: rhbz#2008102 + +* Tue Jul 27 2021 Fedora Release Engineering - 3.0.12-12 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 3.0.12-11 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 3.0.12-10 +- Bootstrap for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 3.0.12-7 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 3.0.12-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sat Aug 17 2019 Miro Hrončok - 3.0.12-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 28 2019 Scott K Logan - 3.0.12-2 +- Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) +- Make the -doc subpackage dependency weaker + +* 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 + +* Fri Nov 16 2018 Scott K Logan - 3.0.10-1 +- Update to 3.0.10 + +* Tue Oct 30 2018 Scott K Logan - 3.0.9-1 +- Update to 3.0.9 +- Add spec conditionals for python version targeting (rhbz#1632320) +- Fix theme package dependency (s/sphinx_rtd_theme/sphinx-theme-alabaster/) + +* Fri Sep 14 2018 Scott K Logan - 3.0.8-1 +- Update to 3.0.8 (rhbz#1459712) + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.0.8-6 +- Rebuilt for Python 3.7 + +* Mon Feb 12 2018 Iryna Shcherbina - 2.0.8-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Feb 04 2017 Scott K Logan - 2.0.8-1 +- Update to version 2.0.8 + +* Mon Dec 19 2016 Miro Hrončok - 2.0.6-2 +- Rebuild for Python 3.6 + +* Sun May 01 2016 Scott K Logan - 2.0.6-1 +- Initial package + diff --git a/sources b/sources deleted file mode 100644 index f76bd02..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (filelock-3.7.1.tar.gz) = b5e0fb6c641fdf70c9a2579e233598df506a6db53de975029ccb904b30fb4dff4f5b39282f4d298d228a851de9f5c91fe642350fac737a616b16f67881c9ae13