Merge branch 'master' into epel8 - new version 1.13

This commit is contained in:
clime 2020-05-21 09:09:09 +02:00
commit abfcd0cd4b
3 changed files with 33 additions and 5 deletions

1
.gitignore vendored
View file

@ -13,3 +13,4 @@
/dist-git-1.10.tar.gz
/dist-git-1.11.tar.gz
/dist-git-1.12.tar.gz
/dist-git-1.13.tar.gz

View file

@ -3,7 +3,7 @@
%global installdir /var/lib/dist-git
Name: dist-git
Version: 1.12
Version: 1.13
Release: 1%{?dist}
Summary: Package source version control system
@ -26,7 +26,6 @@ Requires: git
Requires: git-daemon
Requires: mod_ssl
Requires: crudini
Requires: moreutils
Requires(pre): shadow-utils
%if 0%{?rhel} && 0%{?rhel} < 8
@ -34,14 +33,29 @@ 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
Requires: python3-fedmsg
Recommends: python3-fedmsg
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
%endif
%description
Dist Git is a remote Git repository specifically designed to hold RPM
DistGit is a Git repository specifically designed to hold RPM
package sources.
@ -95,6 +109,14 @@ getent group packager > /dev/null || \
exit 0
%check
%if 0%{?rhel} && 0%{?rhel} < 8
nosetests .
%else
nosetests-3 .
%endif
%install
# ------------------------------------------------------------------------------
# /usr/share/ ........... scripts
@ -228,6 +250,11 @@ fi
%{_bindir}/*
%changelog
* Thu May 21 2020 clime <clime@fedoraproject.com> - 1.13-1
- fedmsg made an optional (recommnended) dependency
- slight refactoring of upload.cgi script
- tests added and documented
* Tue May 28 2019 Miroslav Suchy <msuchy@redhat.com> - 1.12-1
- remove old changelog entries
- do not specify full path for hardlink [RHBZ#1714637]

View file

@ -1 +1 @@
SHA512 (dist-git-1.12.tar.gz) = 65bdb74180553e529374be60b33c2e31113ca2b403138f64f98d19252fb0284555c4305610819a9687327a80470e5b70d5d08277bc3c1972b123f5503bc3d429
SHA512 (dist-git-1.13.tar.gz) = c9118ab7b25a69261794af537da913f653efd6b1c1c771cb0dd80dea626515ab91fb44cc99de51bfdfe85bb34feb0e7a63e4615a4977a780b8ccbf684c3e1a77