From a5f5c8933aac5aff8e5dd42e6f17bf994e0370e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 15:27:21 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index d2d9306..3fd4074 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -251,6 +251,9 @@ fi %{_bindir}/* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jun 12 2020 clime - 1.15-1 - added support for fedora-messaging From 2be82267d6303f97f9d9aa2c965eeb4a1e6c8c7e Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 06:00:47 +0200 Subject: [PATCH 2/4] new release 1.16 --- .gitignore | 1 + dist-git.spec | 22 +++++++++++++++++----- sources | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 82aa739..71b035a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /dist-git-1.13.tar.gz /dist-git-1.14.tar.gz /dist-git-1.15.tar.gz +/dist-git-1.16.tar.gz diff --git a/dist-git.spec b/dist-git.spec index 3fd4074..1116ce6 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.15 -Release: 2%{?dist} +Version: 1.16 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -21,7 +21,11 @@ BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) +%if 0%{?fedora} || 0%{?rhel} > 7 +Requires: (dist-git-selinux if selinux-policy-targeted) +%else Requires: dist-git-selinux +%endif Requires: git Requires: git-daemon Requires: mod_ssl @@ -44,7 +48,7 @@ Requires: moreutils %else Requires: python3-requests Recommends: python3-grokmirror -Recommends: python3-fedmsg +Suggests: python3-fedmsg Suggests: fedora-messaging BuildRequires: python3-nose BuildRequires: python3-parameterized @@ -161,6 +165,7 @@ ln -s %{_datadir}/dist-git/setup_git_package %{buildroot}%{_bindir}/setup_git_pa ln -s %{_datadir}/dist-git/mkbranch %{buildroot}%{_bindir}/mkbranch ln -s %{_datadir}/dist-git/mkbranch_branching %{buildroot}%{_bindir}/mkbranch_branching ln -s %{_datadir}/dist-git/remove_unused_sources %{buildroot}%{_bindir}/remove_unused_sources +mv %{buildroot}%{_datadir}/dist-git/dist-git-gc %{buildroot}%{_bindir}/dist-git-gc # ------------------------------------------------------------------------------ # SELinux @@ -222,6 +227,8 @@ fi %{_unitdir}/dist-git@.service %{_unitdir}/dist-git.socket +%{_unitdir}/dist-git-gc.service +%{_unitdir}/dist-git-gc.timer # ------------------------------------------------------------------------------ # /var/lib/ ...... dynamic persistent files @@ -251,8 +258,13 @@ fi %{_bindir}/* %changelog -* Mon Jul 27 2020 Fedora Release Engineering - 1.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Mon Oct 5 2020 clime - 1.16-1 +- fixed exceptions for fedora-messaging +- fixed topic for fedora-messaging (to git.lookaside.new) +- spec tweak not to require distgit-selinux in containers +- only Suggests fedmsg +- garbage collection (git gc) script and systemd timer + for its periodic run added * Fri Jun 12 2020 clime - 1.15-1 - added support for fedora-messaging diff --git a/sources b/sources index 42b9f0c..d06935c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.15.tar.gz) = 005def569bf512fad536a7711980c00560662fef19a85c165495948353e91b2d7ac42a4a8994b5ae75baf1c39e609bc5693554408ca343e24b68df4f56a8fef0 +SHA512 (dist-git-1.16.tar.gz) = eabea892357ca9fbe63fef19e6439ff6f91c6b20f1c31a5dd567bf405b9024b06c2e199e5ff2594969958e92d413e4f400e0df462a9c865e955eb51915db599f From 8a135c4c474e76b8a6c6cbed7aa99c073dcafce4 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 06:13:45 +0200 Subject: [PATCH 3/4] - always require selinux-policy-targeted right now --- dist-git.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dist-git.spec b/dist-git.spec index 1116ce6..582eae2 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -21,11 +21,7 @@ BuildRequires: systemd Requires: httpd Requires: perl(Sys::Syslog) -%if 0%{?fedora} || 0%{?rhel} > 7 -Requires: (dist-git-selinux if selinux-policy-targeted) -%else Requires: dist-git-selinux -%endif Requires: git Requires: git-daemon Requires: mod_ssl From 1bf2557b698d0290307bc656a3fe7bc7e9cc2896 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 5 Oct 2020 06:33:59 +0200 Subject: [PATCH 4/4] bump release because of koji error ** ** Dependency tokens must begin with alpha-numeric, '_' or '/': Requires: (dist-git-selinux if selinux-policy-targeted)" means (when I want to build a package in koji) --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 582eae2..02b652e 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -254,6 +254,9 @@ fi %{_bindir}/* %changelog +* Mon Oct 5 2020 clime - 1.16-2 +- use simpler dist-git-selinux require due to build-system problem + * Mon Oct 5 2020 clime - 1.16-1 - fixed exceptions for fedora-messaging - fixed topic for fedora-messaging (to git.lookaside.new)