From 309adb53b1e2c38c764644a1c57da354109af35a Mon Sep 17 00:00:00 2001 From: Jakub Kadlčík Date: Feb 13 2019 17:42:52 +0000 Subject: Update copr-keygen to 1.74.git.166.4586fcbd-1.fc26 --- diff --git a/.gitignore b/.gitignore index 4eb2d02..6872510 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /copr-keygen-1.71.tar.gz /copr-keygen-1.72.tar.gz /copr-keygen-1.73.tar.gz +/copr-keygen-1.74.git.166.4586fcbd.tar.gz diff --git a/copr-keygen.spec b/copr-keygen.spec index 4b4e0a0..79c610b 100644 --- a/copr-keygen.spec +++ b/copr-keygen.spec @@ -1,27 +1,23 @@ %global with_test 1 -%if 0%{?rhel} < 7 && 0%{?rhel} > 0 -%global _pkgdocdir %{_docdir}/%{name}-%{version} -%endif Name: copr-keygen -Version: 1.73 -Release: 2%{?dist} +Version: 1.74.git.166.4586fcbd +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.73 +# git checkout copr-keygen-1.74.git.166.4586fcbd # cd copr/keygen # rpkg spec --sources -Source0: copr-keygen-1.73.tar.gz +Source0: copr-keygen-1.74.git.166.4586fcbd.tar.gz BuildArch: noarch BuildRequires: util-linux BuildRequires: systemd -%global _python_bytecompile_extra 0 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-six @@ -87,23 +83,12 @@ This package contains document for copr-keygen service. %build - -CFLAGS="%{optflags}" %{__python3} setup.py build - -%if 0%{?fedora} -# build documentation -pushd docs -make %{?_smp_mflags} html -rm _build/html/.buildinfo -popd -%endif # ?fedora - +%py3_build +make -C docs %{?_smp_mflags} html %install - -%{__python3} setup.py install --skip-build --root %{buildroot} -find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f - +%py3_install +find %{buildroot} -name '*.exe' -delete install -d %{buildroot}%{_sysconfdir}/copr-keygen install -d %{buildroot}%{_sysconfdir}/sudoers.d @@ -127,10 +112,7 @@ install -d %{buildroot}%{_sysconfdir}/logrotate.d/ cp -a configs/sudoers/copr_signer %{buildroot}%{_sysconfdir}/sudoers.d/copr_signer -# docs -%if 0%{?fedora} cp -a docs/_build/html %{buildroot}%{_pkgdocdir}/ -%endif %check @@ -145,12 +127,6 @@ getent passwd copr-signer >/dev/null || \ %post -semanage fcontext -a -t httpd_log_t '/var/log/copr-keygen(/.*)?' -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 &>/dev/null || : @@ -184,8 +160,9 @@ service httpd condrestart &>/dev/null || : %changelog -* Thu Jan 31 2019 Fedora Release Engineering - 1.73-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Fri Oct 19 2018 Miroslav Suchý 1.74-1 +- fix SELinux +- use git_dir_archive instead of git_dir_pack * Mon Aug 06 2018 clime 1.73-1 - manual byte-code compilation diff --git a/sources b/sources index 7757f9d..eccbd5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-keygen-1.73.tar.gz) = cd865089ca1b15ab298dea3624b450096cd10a5fad8a5bf72f0168b52ad70966b4ec39f06a81ff7b36eb60e6cd0b0832cf862b651d21d81d36e57c77ba86a107 +SHA512 (copr-keygen-1.74.git.166.4586fcbd.tar.gz) = 650f5e51b6188859347a6694f1dd454eee9bf44d5aa5a99066bb918f25232ed5d56567abf4b4c46d5ce7f32855e097c212e98c9fcaf08e067c5b61e10d9fdd6e