summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2023-05-16 09:35:05 +0000
committerCoprDistGit <infra@openeuler.org>2023-05-16 09:35:05 +0000
commit5d9b778c3ee261500ae85a4059a671f6f5198410 (patch)
tree2c30369fd43e8c0ee690608e1cd40dc3cac2add5
parentfb24e660f18db644882a54671aa28ddd3abbd73d (diff)
automatic import of copr-keygen
-rw-r--r--.gitignore1
-rw-r--r--copr-keygen.spec16
-rw-r--r--sources2
3 files changed, 11 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 80eb3d7..3e52285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/copr-keygen-1.88.tar.gz
+/copr-keygen-1.89.tar.gz
diff --git a/copr-keygen.spec b/copr-keygen.spec
index 4cd7657..4a6e215 100644
--- a/copr-keygen.spec
+++ b/copr-keygen.spec
@@ -2,7 +2,7 @@
%global copr_common_version 0.16.3.dev
Name: copr-keygen
-Version: 1.88
+Version: 1.89
Release: 1%{?dist}
Summary: Part of Copr build system. Aux service that generate keys for signd
@@ -90,7 +90,7 @@ This package contains document for copr-keygen service.
# https://bugzilla.redhat.com/show_bug.cgi?id=2113156
# https://bugzilla.redhat.com/show_bug.cgi?id=2105348
# https://bugzilla.redhat.com/show_bug.cgi?id=2007282
-%if 0%{?fedora} <= 36 && 0%{?fedora}
+%if 0%{?fedora} <= 36
make -C docs %{?_smp_mflags} html
%endif
@@ -116,18 +116,18 @@ install -d %{buildroot}%{_sysconfdir}/cron.daily
%{__install} -p -m 0755 run/gpg-copr-prolong %{buildroot}/%{_bindir}/
%{__install} -p -m 0755 run/application.py %{buildroot}%{_datadir}/copr-keygen/
+%{__install} -p -m 0644 configs/httpd/copr-keygen.conf.example %{buildroot}%{_pkgdocdir}/httpd/
%{__install} -p -m 0644 configs/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/copr-keygen
+%{__install} -p -m 0644 configs/sign/sign.conf.example %{buildroot}%{_pkgdocdir}/sign/sign.conf.example
%{__install} -p -m 0755 configs/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/copr-keygen
cp -a configs/sudoers/copr_signer %{buildroot}%{_sysconfdir}/sudoers.d/copr_signer
# FTBFS - See above
-%if 0%{?fedora} <= 36 && 0%{?fedora}
+%if 0%{?fedora} <= 36
cp -a docs/_build/html %{buildroot}%{_pkgdocdir}/
-%{__install} -p -m 0644 configs/httpd/copr-keygen.conf.example %{buildroot}%{_pkgdocdir}/httpd/
-%{__install} -p -m 0644 configs/sign/sign.conf.example %{buildroot}%{_pkgdocdir}/sign/sign.conf.example
%endif
%check
@@ -171,12 +171,14 @@ systemctl condrestart httpd &>/dev/null || :
%ghost %{_localstatedir}/log/copr-keygen/main.log
-%if 0%{?fedora}
%files -n copr-keygen-doc
%doc %{_pkgdocdir}
-%endif
+
%changelog
+* Wed Mar 22 2023 Jiri Kyjovsky <j1.kyjovsky@gmail.com> 1.89-1
+- Fix config files installation pattern
+
* Tue Jan 24 2023 Jakub Kadlcik <frostyx@email.cz> 1.88-1
- Fix validation for projects with dash and/or dot in their name
diff --git a/sources b/sources
index 375a789..d36ddab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32f2e7c75eafe57b216f55165f32ac79 copr-keygen-1.88.tar.gz
+3a7109633b1163872f7b282c5a3bec4e copr-keygen-1.89.tar.gz