From 23bd6418fc5de023af28c677deaad302d0cc33af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 03:28:25 +0000 Subject: [PATCH 01/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 3bed10d..439ba50 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 5 2020 clime - 1.16-3 - return back 1.16-1 state From 1646d18dbbae9923372577eceb9493064bb4f938 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:51:08 +0000 Subject: [PATCH 02/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 439ba50..cac4b8b 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6b2ffc66459af6dea8ebf41632b8ce2b42014e2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:44:24 +0000 Subject: [PATCH 03/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 cac4b8b..80f0708 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2a8a3bfed5b106c895747e6913573a35ccb3d266 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:32:33 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 80f0708..d0b15f1 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -258,6 +258,9 @@ fi %{_bindir}/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 71747fb54dd04a6e117c1749e5e92404a3b8e552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Jan 2023 18:20:21 +0100 Subject: [PATCH 05/13] Update dist-git to 1.17-1 --- .gitignore | 1 + dist-git.spec | 40 +++++++++++++++++----------------------- sources | 2 +- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 71b035a..8328957 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /dist-git-1.14.tar.gz /dist-git-1.15.tar.gz /dist-git-1.16.tar.gz +/dist-git-1.17.tar.gz diff --git a/dist-git.spec b/dist-git.spec index d0b15f1..58b0e32 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,12 +3,12 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.16 -Release: 7%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 -License: MIT and GPLv1 +License: MIT AND GPL-1.0-only URL: https://github.com/release-engineering/dist-git # Source is created by # git clone https://github.com/release-engineering/dist-git.git @@ -50,7 +50,11 @@ Requires: python3-requests Recommends: python3-grokmirror Suggests: python3-fedmsg Suggests: fedora-messaging +%if 0%{?rhel} == 8 BuildRequires: python3-nose +%else +BuildRequires: python3-pytest +%endif BuildRequires: python3-parameterized BuildRequires: python3-requests @@ -115,10 +119,14 @@ exit 0 %check -%if 0%{?rhel} && 0%{?rhel} < 8 -nosetests . +%if 0%{?rhel} && 0%{?rhel} <= 8 +%if 0%{?rhel} < 8 +nosetests -v . %else -nosetests-3 . +nosetests-3 -v . +%endif +%else +pytest -vv . %endif @@ -258,23 +266,9 @@ fi %{_bindir}/* %changelog -* Thu Jul 21 2022 Fedora Release Engineering - 1.16-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.16-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.16-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.16-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 5 2020 clime - 1.16-3 -- return back 1.16-1 state - -* Mon Oct 5 2020 clime - 1.16-2 -- use simpler dist-git-selinux require due to build-system problem +* Wed Jan 04 2023 Miroslav Suchý 1.17-1 +- use spdx license +- use pytest instead of nose test * Mon Oct 5 2020 clime - 1.16-1 - fixed exceptions for fedora-messaging diff --git a/sources b/sources index d06935c..7ef4dd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.16.tar.gz) = eabea892357ca9fbe63fef19e6439ff6f91c6b20f1c31a5dd567bf405b9024b06c2e199e5ff2594969958e92d413e4f400e0df462a9c865e955eb51915db599f +SHA512 (dist-git-1.17.tar.gz) = ed6288f1e0aed0779766ee685ea7563a95f4a99c50d671895e3cf45262dc9c6e06ed0967b905c03ccbf93bad4b8000a85096914d57849a21bf9573ff61951826 From 5b688911db89fbda91b6d69dc7c65012bbc8a516 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:28:55 +0000 Subject: [PATCH 06/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 58b0e32..b7c2cb8 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Miroslav Suchý 1.17-1 - use spdx license - use pytest instead of nose test From e358939573a91e2f27e2ce2bf90c1abb94f9d583 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 17:32:52 +0000 Subject: [PATCH 07/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_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 b7c2cb8..4d62687 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9c44231b566dc53c8238499fddf00cf1ad94ef6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 5 Oct 2023 12:03:13 +0200 Subject: [PATCH 08/13] setup packit pull-from-upstream automation --- packit.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..0b8d165 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,24 @@ +upstream_project_url: https://github.com/release-engineering/dist-git +upstream_tag_template: dist-git-{version}-1 +issue_repository: https://github.com/release-engineering/dist-git +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - rawhide + - epel9 + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-all + - epel9 + +- job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all + - epel9 From 4e34d01487c94c9406fa2c7eccd8c9607c765502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:14:36 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 4d62687..3a592de 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9dead15c6672bc0c7db2ff9adcbe79e31288b9ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 09:31:20 +0000 Subject: [PATCH 10/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 3a592de..2aa0b74 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a8f24dd11ff8441d7b9b5a160ecda6b25e9b8547 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:03:49 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- dist-git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dist-git.spec b/dist-git.spec index 2aa0b74..b24d4f3 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -4,7 +4,7 @@ Name: dist-git Version: 1.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -266,6 +266,9 @@ fi %{_bindir}/* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.17-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eb755f5368dc8ffb2ee2cd86c91ac64126209a0b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Sep 2024 21:19:04 +0200 Subject: [PATCH 12/13] Update dist-git to 1.18-1 --- .gitignore | 1 + dist-git.spec | 67 +++++++++++++++++++-------------------------------- sources | 2 +- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 8328957..87b41e3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /dist-git-1.15.tar.gz /dist-git-1.16.tar.gz /dist-git-1.17.tar.gz +/dist-git-1.18.tar.gz diff --git a/dist-git.spec b/dist-git.spec index b24d4f3..3229023 100644 --- a/dist-git.spec +++ b/dist-git.spec @@ -3,8 +3,8 @@ %global installdir /var/lib/dist-git Name: dist-git -Version: 1.17 -Release: 6%{?dist} +Version: 1.18 +Release: 1%{?dist} Summary: Package source version control system # upload.cgi uses GPLv1 @@ -21,31 +21,13 @@ 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 Requires: crudini Requires(pre): shadow-utils -%if 0%{?rhel} && 0%{?rhel} < 8 -Requires: python-requests -Requires: python-configparser -Requires: python-grokmirror -Requires: fedmsg -BuildRequires: python-nose -BuildRequires: python-nose-parameterized -BuildRequires: python-requests -BuildRequires: python-configparser - -# temporary because global Requires doesn't work right now, see the comment below -Requires: moreutils - -%else Requires: python3-requests Recommends: python3-grokmirror Suggests: python3-fedmsg @@ -61,8 +43,13 @@ BuildRequires: python3-requests # this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810 Recommends: moreutils +%if 0%{?fedora} && 0%{?fedora} >= 41 +# The `cgi` module was removed from the Python 3.13 standard library +BuildRequires: python3-legacy-cgi +Requires: python3-legacy-cgi %endif + %description DistGit is a Git repository specifically designed to hold RPM package sources. @@ -72,16 +59,11 @@ package sources. Summary: SELinux support for dist-git BuildRequires: checkpolicy -BuildRequires: policycoreutils -BuildRequires: selinux-policy-devel BuildRequires: hardlink Requires: %name = %version-%release -%if "%{_selinux_policy_version}" != "" -Requires: selinux-policy >= %{_selinux_policy_version} -%endif -Requires(post): /usr/sbin/semodule, /sbin/restorecon -Requires(postun): /usr/sbin/semodule, /sbin/restorecon +BuildRequires: selinux-policy-devel +%{?selinux_requires} %description selinux @@ -258,28 +240,29 @@ fi %dir %{_datadir}/dist-git %attr (775, -, -) %{_datadir}/dist-git/* +%{_bindir}/dist-git-gc +# TODO: move _datadir executables to _libexecdir, and drop these symlinks +%{_bindir}/mkbranch +%{_bindir}/mkbranch_branching +%{_bindir}/remove_unused_sources +%{_bindir}/setup_git_package %files selinux %doc selinux/* %{_datadir}/selinux/*/%{modulename}.pp -%{_bindir}/* + %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1.17-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 1.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Fri Sep 27 2024 Pavel Raiskup 1.18-1 +- replace test on _selinux_policy_version by macro that does it all +- handle situation when _selinux_policy_version is not defined +- silence pylint +- remove rhel7 specific code +- Move %%_bindir symlinks out from dist-git-selinux +- Depend on python3-legacy-cgi for F41+ +- licensing: update the project's COPYING file +- dist-git: move the code into sub-directory * Wed Jan 04 2023 Miroslav Suchý 1.17-1 - use spdx license diff --git a/sources b/sources index 7ef4dd9..812f1eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dist-git-1.17.tar.gz) = ed6288f1e0aed0779766ee685ea7563a95f4a99c50d671895e3cf45262dc9c6e06ed0967b905c03ccbf93bad4b8000a85096914d57849a21bf9573ff61951826 +SHA512 (dist-git-1.18.tar.gz) = f3c4caa189589d9211fe37703d9eee0b7f03705536d598a955280ef4477095eeb1323c96c550f0b2a951b74c99fcd51b496c47e291c8658192c097d8bae0872d From a2512af8cb00aa72936f19a9cc3e1bfd29b14b04 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Sep 2024 21:19:45 +0200 Subject: [PATCH 13/13] Cleanup .gitignore --- .gitignore | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 87b41e3..a0c60c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1 @@ -/dist-git-0.10.tar.gz -/dist-git-0.11.tar.gz -/dist-git-1.0.tar.gz -/dist-git-1.1.tar.gz -/dist-git-1.2.tar.gz -/dist-git-1.3.tar.gz -/dist-git-1.4.tar.gz -/dist-git-1.5.tar.gz -/dist-git-1.6.tar.gz -/dist-git-1.7.tar.gz -/dist-git-1.8.tar.gz -/dist-git-1.9.tar.gz -/dist-git-1.10.tar.gz -/dist-git-1.11.tar.gz -/dist-git-1.12.tar.gz -/dist-git-1.13.tar.gz -/dist-git-1.14.tar.gz -/dist-git-1.15.tar.gz -/dist-git-1.16.tar.gz -/dist-git-1.17.tar.gz -/dist-git-1.18.tar.gz +/dist-git-*.tar.gz