Compare commits

..

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

4 changed files with 65 additions and 70 deletions

21
.gitignore vendored
View file

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

View file

@ -3,7 +3,7 @@
%global installdir /var/lib/dist-git
Name: dist-git
Version: 1.20
Version: 1.17
Release: 2%{?dist}
Summary: Package source version control system
@ -21,34 +21,48 @@ 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
%if 0%{?rhel} == 8
BuildRequires: python3-nose
%else
BuildRequires: python3-pytest
%endif
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 +72,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 +110,24 @@ 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
%if 0%{?rhel} < 8
nosetests -v .
%else
nosetests-3 -v .
%endif
%else
pytest -vv .
%endif
%install
@ -123,8 +149,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,40 +258,16 @@ 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
* Tue Jul 07 2026 Miroslav Suchý <msuchy@redhat.com> 1.20-1
- Fix tests for Python 3.15: replace removed CGIHTTPRequestHandler
* 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
* 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
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 04 2023 Miroslav Suchý <msuchy@redhat.com> 1.17-1
- use spdx license

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.17.tar.gz) = ed6288f1e0aed0779766ee685ea7563a95f4a99c50d671895e3cf45262dc9c6e06ed0967b905c03ccbf93bad4b8000a85096914d57849a21bf9573ff61951826