From 626e1a96821723d9d19b87f930c451827ff4ca2d Mon Sep 17 00:00:00 2001 From: clime Date: Apr 12 2017 16:06:01 +0000 Subject: Update copr-dist-git to 0.26-1 --- diff --git a/.gitignore b/.gitignore index af5b2a9..7ad9f32 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /copr-dist-git-0.20.tar.gz /copr-dist-git-0.23.tar.gz /copr-dist-git-0.24.tar.gz +/copr-dist-git-0.26.tar.gz diff --git a/copr-dist-git.spec b/copr-dist-git.spec index 4cc1afb..44554b5 100644 --- a/copr-dist-git.spec +++ b/copr-dist-git.spec @@ -1,18 +1,19 @@ Name: copr-dist-git -Version: 0.24 -Release: 2%{?dist} +Version: 0.26 +Release: 1%{?dist} Summary: Copr services for Dist Git server Group: Applications/Productivity License: GPLv2+ -URL: https://fedorahosted.org/copr/ +URL: https://pagure.io/copr/copr # Source is created by -# git clone https://git.fedorahosted.org/git/copr.git +# git clone https://pagure.io/copr/copr.git # cd copr/dist-git # tito build --tgz Source0: %{name}-%{version}.tar.gz BuildArch: noarch +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} BuildRequires: systemd BuildRequires: dist-git @@ -72,6 +73,16 @@ This package contains Copr services for Dist Git server. %build +%pre +getent group docker >/dev/null || groupadd -r docker +getent group packager >/dev/null || groupadd -r packager +getent group copr-dist-git >/dev/null || groupadd -r copr-dist-git +getent group apache >/dev/null || groupadd -r apache +getent passwd copr-dist-git >/dev/null || \ +useradd -r -m -g copr-dist-git -G packager,docker,apache -c "copr-dist-git user" copr-dist-git +/usr/bin/passwd -l copr-dist-git >/dev/null + +exit 0 %install @@ -107,8 +118,6 @@ PYTHONPATH=.:$PYTHONPATH python -B -m pytest \ # change context to be readable by cgit semanage fcontext -a -t httpd_sys_content_t '/var/lib/copr-dist-git(/.*)?' restorecon -rv /var/lib/copr-dist-git -groupadd docker -usermod -aG docker copr-service %systemd_post copr-dist-git.service %preun @@ -124,22 +133,34 @@ usermod -aG docker copr-service %dir %{_datadir}/copr %{_datadir}/copr/* %dir %{_sysconfdir}/copr -%config(noreplace) %attr(0640, root, copr-service) %{_sysconfdir}/copr/copr-dist-git.conf +%config(noreplace) %attr(0640, root, copr-dist-git) %{_sysconfdir}/copr/copr-dist-git.conf %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/httpd/conf.d/copr-dist-git.conf -%dir %attr(0755, copr-service, copr-service) %{_sharedstatedir}/copr-dist-git/ +%dir %attr(0755, copr-dist-git, copr-dist-git) %{_sharedstatedir}/copr-dist-git/ %{_unitdir}/copr-dist-git.service %dir %{_sysconfdir}/logrotate.d %config(noreplace) %{_sysconfdir}/logrotate.d/copr-dist-git -%attr(0755, copr-service, copr-service) %{_var}/log/copr-dist-git -%attr(0644, copr-service, copr-service) %{_var}/log/copr-dist-git/main.log +%attr(0755, copr-dist-git, copr-dist-git) %{_var}/log/copr-dist-git +%attr(0644, copr-dist-git, copr-dist-git) %{_var}/log/copr-dist-git/main.log %ghost %{_var}/log/copr-dist-git/*.log %changelog -* Fri Feb 10 2017 Fedora Release Engineering - 0.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Wed Apr 12 2017 clime 0.26-1 +- follow docker ExclusiveArches spec directive +- replace leftover username in lograte config +- fix README + +* Mon Apr 10 2017 clime 0.25-1 +- compatibility fixes for the latest dist-git (upstream) +- improved error logging and exception handling of external commands +- improve repo creation & srpm import logging and exception handling +- replace copr-service user by copr-dist-git and useradd the user +- Bug 1426033 - git-annex missing, cannot use tito.builder.GitAnnexBuilder +- replace fedorahosted links +- error logging of pyrpkg upload into lookaside +- update langpack hack in dist-git Dockerfile * Thu Jan 26 2017 clime 0.24-1 - install mock-scm in docker image from official fedora repos diff --git a/sources b/sources index 3e1c3b2..af736be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-dist-git-0.24.tar.gz) = b6246c5f3a669353c70a1bd1fd62eb2431a7b9fc2512cd65d8dc88c49542ee4c1b694e15435e5babff72e9b4eff1b81a49d86bd5d2ab761708e84909f84f62e1 +SHA512 (copr-dist-git-0.26.tar.gz) = ad04ea96629801054a2d60cb5b5fdbcabcbf5078eea8e8e8ee65f90c9dd0e1f40874c946fb68b59bb6bd318f5a804f3c53ff0829c0476598c1dea906f10df10c