Compare commits

..

No commits in common. "rawhide" and "f36" have entirely different histories.

4 changed files with 71 additions and 77 deletions

20
.gitignore vendored
View file

@ -1 +1,19 @@
/dist-git-*.tar.gz
/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

View file

@ -3,12 +3,12 @@
%global installdir /var/lib/dist-git
Name: dist-git
Version: 1.20
Release: 2%{?dist}
Version: 1.16
Release: 6%{?dist}
Summary: Package source version control system
# upload.cgi uses GPLv1
License: MIT AND GPL-1.0-only
License: MIT and GPLv1
URL: https://github.com/release-engineering/dist-git
# Source is created by
# git clone https://github.com/release-engineering/dist-git.git
@ -21,34 +21,44 @@ 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
%if 0%{?rhel} && 0%{?rhel} < 10
Requires(pre): shadow-utils
%endif
%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
Suggests: fedora-messaging
BuildRequires: python3-devel
BuildRequires: python3-pytest
BuildRequires: python3-nose
BuildRequires: python3-parameterized
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.
@ -58,11 +68,16 @@ package sources.
Summary: SELinux support for dist-git
BuildRequires: checkpolicy
BuildRequires: policycoreutils
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
Requires: %name = %version-%release
BuildRequires: selinux-policy-devel
%{?selinux_requires}
%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
%description selinux
@ -91,17 +106,20 @@ cd -
%pre
%if 0%{?rhel} && 0%{?rhel} < 10
# ------------------------------------------------------------------------------
# Users and Groups
# ------------------------------------------------------------------------------
getent group packager > /dev/null || \
groupadd -r packager
exit 0
%endif
%check
%pytest -vv .
%if 0%{?rhel} && 0%{?rhel} < 8
nosetests .
%else
nosetests-3 .
%endif
%install
@ -123,8 +141,6 @@ cp -a configs/httpd/dist-git.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
cp -a configs/httpd/dist-git/* %{buildroot}%{_sysconfdir}/httpd/conf.d/dist-git/
cp -a configs/systemd/* %{buildroot}%{_unitdir}/
install -m0644 -D configs/sysusers.d/dist-git.conf %{buildroot}%{_sysusersdir}/dist-git.conf
# ------------------------------------------------------------------------------
# /var/lib/ ...... dynamic persistent files
# ------------------------------------------------------------------------------
@ -234,44 +250,28 @@ 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
%{_sysusersdir}/dist-git.conf
%files selinux
%doc selinux/*
%{_datadir}/selinux/*/%{modulename}.pp
%{_bindir}/*
%changelog
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jul 07 2026 Miroslav Suchý <msuchy@redhat.com> 1.20-1
- Fix tests for Python 3.15: replace removed CGIHTTPRequestHandler
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Feb 13 2026 Pavel Raiskup <pavel@raiskup.cz> 1.19-1
- Avoid using parameterized and nose
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Sep 27 2024 Pavel Raiskup <praiskup@redhat.com> 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
* Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-3
- return back 1.16-1 state
* Wed Jan 04 2023 Miroslav Suchý <msuchy@redhat.com> 1.17-1
- use spdx license
- use pytest instead of nose test
* Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-2
- use simpler dist-git-selinux require due to build-system problem
* Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-1
- fixed exceptions for fedora-messaging

View file

@ -1,24 +0,0 @@
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

View file

@ -1 +1 @@
SHA512 (dist-git-1.20.tar.gz) = f68aa733a2d0e0faa8973ced5260a1c5b0f6892c5ebfca977ac17ca3bfbda33225d866bb1c16abe761452d17594399a75815a49f5d941dd2e0c5404a69a1f3be
SHA512 (dist-git-1.16.tar.gz) = eabea892357ca9fbe63fef19e6439ff6f91c6b20f1c31a5dd567bf405b9024b06c2e199e5ff2594969958e92d413e4f400e0df462a9c865e955eb51915db599f