diff --git a/.gitignore b/.gitignore index aeab004..7c4626b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cepces-0.3.7.tar.gz /cepces-0.3.8.tar.gz /cepces-0.3.9.tar.gz +/cepces-0.3.12.tar.gz diff --git a/cepces.spec b/cepces.spec index 98bf317..8ba8755 100644 --- a/cepces.spec +++ b/cepces.spec @@ -7,7 +7,7 @@ %global modulename %{name} Name: cepces -Version: 0.3.9 +Version: 0.3.12 Release: %autorelease Summary: Certificate Enrollment through CEP/CES @@ -17,6 +17,8 @@ Source0: https://github.com/openSUSE/%{name}/archive/v%{version}/%{name}- BuildArch: noarch +BuildRequires: python3dist(pytest) + Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} %if %{with selinux} Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) @@ -26,6 +28,9 @@ Recommends: logrotate Supplements: %{name}-certmonger = %{version}-%{release} +%generate_buildrequires +%pyproject_buildrequires + %description cepces is an application for enrolling certificates through CEP and CES. It requires certmonger to operate. @@ -35,19 +40,11 @@ have been tested. %package -n python%{python3_pkgversion}-%{name} Summary: Python part of %{name} - -BuildRequires: python3dist(setuptools) -BuildRequires: python3dist(cryptography) >= 1.2 -BuildRequires: python3dist(requests) -BuildRequires: python3dist(gssapi) -BuildRequires: python3dist(requests-gssapi) -BuildRequires: python3-devel - -Requires: python3dist(setuptools) -Requires: python3dist(cryptography) >= 1.2 -Requires: python3dist(requests) -Requires: python3dist(gssapi) -Requires: python3dist(requests-gssapi) +# Uses keyctl for keyring handling +Recommends: keyutils +# Uses pinentry for username/password +Recommends: pinentry +Recommends: (pinentry-qt6 if plasma-workspace) %description -n python%{python3_pkgversion}-%{name} %{name} is an application for enrolling certificates through CEP and CES. @@ -81,7 +78,7 @@ SELinux support for %{name} %autosetup -p1 %build -%py3_build +%pyproject_wheel %if %{with selinux} # Build the SELinux module(s). @@ -92,9 +89,10 @@ done %endif %install -%py3_install +%pyproject_install +%pyproject_save_files %{name} -install -d %{buildroot}%{logdir} +install -d -m0755 %{buildroot}%{logdir} %if %{with selinux} # Install the SELinux module(s). @@ -129,9 +127,8 @@ cat <%{buildroot}%{_sysconfdir}/logrotate.d/%{name} EOF %check -# Create a symlink so test can locate cepces_test -ln -s tests/cepces_test . -%{__python3} setup.py test +%pyproject_check_import +%pytest %if %{with selinux} %pre selinux @@ -181,10 +178,8 @@ fi %dir %{_sysconfdir}/logrotate.d %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%files -n python%{python3_pkgversion}-%{name} +%files -n python%{python3_pkgversion}-%{name} -f %{pyproject_files} %license LICENSE -%{python3_sitelib}/%{name} -%{python3_sitelib}/%{name}-%{version}-py?.*.egg-info %files certmonger %{_libexecdir}/certmonger/%{name}-submit diff --git a/sources b/sources index 1270c0f..30aed32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cepces-0.3.9.tar.gz) = c94dddfba06d5095fa48e15719131f3fa36b104a88c71505663b1cfc793e93d9d9281be77fbbdbd6c683f14c481c7ed01d44c527d97b98ac4653eeb3c057382d +SHA512 (cepces-0.3.12.tar.gz) = 8259e3c26873549425ce5fb4b34ce6c71ebea58a70a9f077efe2a081b81eb831955cb6a654a86b53d5a8862d9c50ed47c992d606146d0525ad319ce8fde2b5a3