diff --git a/.gitignore b/.gitignore index 19d1359..a426f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -python-daemon-1.5.2.tar.gz -/python-daemon-1.6.tar.gz -/python-daemon-2.1.0.tar.gz -/python-daemon-2.1.1.tar.gz -/python-daemon-2.1.2.tar.gz -/python-daemon-2.2.3.tar.gz -/python-daemon-2.2.4.tar.gz -/python-daemon-2.3.0.tar.gz -/python-daemon-2.3.1.tar.gz +python-daemon-*.tar.gz diff --git a/python-daemon.spec b/python-daemon.spec index f609c04..68759ce 100644 --- a/python-daemon.spec +++ b/python-daemon.spec @@ -1,62 +1,56 @@ -%bcond_without tests - Name: python-daemon -Version: 2.3.1 +Version: 2.3.2 Release: %autorelease Summary: Library to implement a well-behaved Unix daemon process -# Some build scripts and test franework are licensed GPLv3+ but those aren't shipped -License: ASL 2.0 +# Some build scripts and test framework are licensed GPL-3.0-or-later but those aren't shipped +License: Apache-2.0 URL: https://pagure.io/python-daemon -Source0: %pypi_source -# Downstream-only patch, twine is unnecessary to build -# https://pagure.io/python-daemon/c/cc9e6a0321a547aacd568aa1e8c7d94a000d5d11 -Patch0: remove-twine-dependency.patch +Source: %{pypi_source python-daemon} BuildArch: noarch -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-docutils +BuildRequires: python3-devel -%if %{with tests} -BuildRequires: python%{python3_pkgversion}-testscenarios -BuildRequires: python%{python3_pkgversion}-lockfile -BuildRequires: python%{python3_pkgversion}-testtools -%endif +%global _description %{expand: +This library implements the well-behaved daemon specification of PEP 3143, +"Standard daemon process library".} -%global _description\ -This library implements the well-behaved daemon specification of PEP 3143,\ -"Standard daemon process library".\ %description %_description -%package -n python%{python3_pkgversion}-daemon -Summary: Library to implement a well-behaved Unix daemon process -%description -n python%{python3_pkgversion}-daemon %_description +%package -n python3-daemon +Summary: %{summary} + + +%description -n python3-daemon %_description -This is the python3 version of the library. %prep %autosetup -p1 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters +sed -e '/"coverage"/d' -i setup.py + + +%generate_buildrequires +%pyproject_buildrequires -x test + %build -%py3_build +%pyproject_wheel + %install -%py3_install -rm -fr %{buildroot}%{python3_sitelib}/tests +%pyproject_install +%pyproject_save_files daemon + -%if %{with tests} -# Test suite requires minimock and lockfile %check -PYTHONPATH=$(pwd) %{__python3} -m unittest discover -%endif +PYTHONPATH=%{buildroot}%{python3_sitelib} %python3 -m setup test + + +%files -n python3-daemon -f %{pyproject_files} -%files -n python%{python3_pkgversion}-daemon -%license LICENSE.ASF-2 -%{python3_sitelib}/daemon/ -%{python3_sitelib}/python_daemon-%{version}-py%{python3_version}.egg-info/ %changelog %autochangelog diff --git a/remove-twine-dependency.patch b/remove-twine-dependency.patch deleted file mode 100644 index a430c79..0000000 --- a/remove-twine-dependency.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nurp python-daemon-2.2.4.orig/setup.py python-daemon-2.2.4/setup.py ---- python-daemon-2.2.4.orig/setup.py 2019-10-04 22:21:52.000000000 -0500 -+++ python-daemon-2.2.4/setup.py 2020-03-22 14:04:30.853124836 -0500 -@@ -68,7 +68,6 @@ setup_kwargs = dict( - zip_safe=False, - setup_requires=[ - "docutils", -- "twine", - ], - test_suite="setup.test_suite", - tests_require=test_requirements, diff --git a/sources b/sources index 10806a0..0a7d9e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-daemon-2.3.1.tar.gz) = 128fd8ac125eac613936668bb555635c8cec576d5c23513210f0956983c70720dd93906adeee581b192b57480a3df93dc1e08f6f7b62e38b2404fa00aba4805a +SHA512 (python-daemon-2.3.2.tar.gz) = d9f6e6c376a496fae96bd9efed0a56d00a137617a3d1d5ef74802ef176bc813bb1d49bbb9164cdbec03213529f944b32b257bcc64283abfa4a3522ff00826bfd