From e6abe621c9cf5dedcb4bc8876209df5b2a9f1b46 Mon Sep 17 00:00:00 2001 From: clime Date: Aug 06 2018 21:02:11 +0000 Subject: Update copr-keygen to 1.73-1.fc28 --- diff --git a/.gitignore b/.gitignore index c4a61a3..4eb2d02 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /copr-keygen-1.70.tar.gz /copr-keygen-1.71.tar.gz /copr-keygen-1.72.tar.gz +/copr-keygen-1.73.tar.gz diff --git a/copr-keygen.spec b/copr-keygen.spec index e4aa595..9caaeed 100644 --- a/copr-keygen.spec +++ b/copr-keygen.spec @@ -1,27 +1,27 @@ %global with_test 1 %if 0%{?rhel} < 7 && 0%{?rhel} > 0 %global _pkgdocdir %{_docdir}/%{name}-%{version} -%global __python2 %{__python} %endif Name: copr-keygen -Version: 1.72 -Release: 3%{?dist} +Version: 1.73 +Release: 1%{?dist} Summary: Part of Copr build system. Aux service that generate keys for signd License: GPLv2+ URL: https://pagure.io/copr/copr # Source is created by: # git clone https://pagure.io/copr/copr.git -# git checkout copr-keygen-1.72 +# git checkout copr-keygen-1.73 # cd copr/keygen # rpkg spec --sources -Source0: copr-keygen-1.72.tar.gz +Source0: copr-keygen-1.73.tar.gz BuildArch: noarch BuildRequires: util-linux BuildRequires: systemd +%global _python_bytecompile_extra 0 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-six @@ -30,7 +30,6 @@ BuildRequires: python3-flask # for tests BuildRequires: python3-pytest BuildRequires: python3-pytest-cov -BuildRequires: python3-mock Requires: haveged Requires: gnupg2 @@ -47,7 +46,10 @@ Requires: python3-flask # tests Requires: python3-pytest Requires: python3-pytest-cov -Requires: python3-mock + +# scriptlets +Requires(post): initscripts +Requires(postun): initscripts %description -n copr-keygen @@ -64,7 +66,6 @@ Obsoletes: copr-doc < 1.38 BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-mock BuildRequires: python3-requests BuildRequires: python3-six BuildRequires: python3-flask @@ -133,7 +134,7 @@ cp -a docs/_build/html %{buildroot}%{_pkgdocdir}/ %check -PYTHONPATH=./src:$PYTHONPATH %{__python3} -m pytest --cov-report term-missing --cov ./src tests +PYTHONPATH=./src:$PYTHONPATH %{__python3} -B -m pytest --cov-report term-missing --cov ./src tests %pre @@ -150,10 +151,12 @@ restorecon -rv /var/log/copr-keygen/ semanage fcontext -a -t httpd_var_lib_t '/var/lib/copr-keygen(/.*)?' restorecon -rv /var/lib/copr-keygen/ -service httpd condrestart +service httpd condrestart &>/dev/null || : + %postun -service httpd condrestart +service httpd condrestart &>/dev/null || : + %files %license LICENSE @@ -181,11 +184,9 @@ service httpd condrestart %changelog -* Thu Jul 12 2018 Fedora Release Engineering - 1.72-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro HronĨok - 1.72-2 -- Rebuilt for Python 3.7 +* Mon Aug 06 2018 clime 1.73-1 +- manual byte-code compilation +- better "condrestart" foreign services * Fri May 18 2018 clime 1.72-1 - fix gnupg2 requirement diff --git a/sources b/sources index 499d2f6..7757f9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-keygen-1.72.tar.gz) = 80ce97c610d278c9b6c08952d625cf4f7fb7782977a22512ac7ec33ea15c31388f169964308f4e8c603ecdee23a6265173dc87bdb65ae0ec94a2e28f607e4c41 +SHA512 (copr-keygen-1.73.tar.gz) = cd865089ca1b15ab298dea3624b450096cd10a5fad8a5bf72f0168b52ad70966b4ec39f06a81ff7b36eb60e6cd0b0832cf862b651d21d81d36e57c77ba86a107