From 4e2cd85f258dc2717a9fb68c3e99152b6d7a058c Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Mon, 11 Mar 2019 22:58:15 +0100
Subject: [PATCH] new release 1.10

---
 .gitignore    |  1 +
 dist-git.spec | 20 +++++++++++++-------
 sources       |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53c5065..0eed943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /dist-git-1.7.tar.gz
 /dist-git-1.8.tar.gz
 /dist-git-1.9.tar.gz
+/dist-git-1.10.tar.gz
diff --git a/dist-git.spec b/dist-git.spec
index 89136ee..387e1f7 100644
--- a/dist-git.spec
+++ b/dist-git.spec
@@ -3,8 +3,8 @@
 %global installdir /var/lib/dist-git
 
 Name:           dist-git
-Version:        1.9
-Release:        2%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Package source version control system
 
 # upload.cgi uses GPLv1
@@ -25,7 +25,6 @@ Requires:       dist-git-selinux
 Requires:       git
 Requires:       git-daemon
 Requires:       mod_ssl
-Requires:       fedmsg
 Requires:       crudini
 Requires:       moreutils
 Requires(pre):  shadow-utils
@@ -34,10 +33,12 @@ Requires(pre):  shadow-utils
 Requires:       python-requests
 Requires:       python-configparser
 Requires:       python-grokmirror
+Requires:       fedmsg
 %else
-Requires:       python2-requests
-Requires:       python2-configparser
+Requires:       python3-requests
+Requires:       python3-configparser
 Recommends:     python3-grokmirror
+Requires:       python3-fedmsg
 %endif
 
 %description
@@ -126,6 +127,10 @@ install -d %{buildroot}%{installdir}/web
 
 cp -a scripts/httpd/upload.cgi %{buildroot}%{installdir}/web/
 
+%if 0%{?rhel} && 0%{?rhel} < 8
+    sed -i '1 s|#.*|#!/usr/bin/python2|' %{buildroot}%{installdir}/web/upload.cgi
+%endif
+
 # ------------------------------------------------------------------------------
 # SELinux
 # ------------------------------------------------------------------------------
@@ -215,8 +220,9 @@ fi
 
 
 %changelog
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon Mar 11 2019 clime <clime@redhat.com> 1.10-1
+- python3 support
+- fix post-receive hook in case post.receive.d is empty
 
 * Fri Nov 23 2018 clime <clime@redhat.com> 1.9-1
 - do not create sources file when creating a repo
diff --git a/sources b/sources
index d1a4e53..355aded 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dist-git-1.9.tar.gz) = a8a474c926fb3379e83414bfdeaab7f6b79c4fcad0380ef3a205fc9f69afd799ae5afec11f3aaa15af9c67fc699537bfb26231f5fdcc5031c6d79ef3d47a5bc7
+SHA512 (dist-git-1.10.tar.gz) = ca3dd038e85c75dcbf30f82f326ec4a61a4fff9e3f27143f4ec3ca4fd77a3ba4661dde317e625f3e42d0ca0e6abfc5a3995e78678eeb8dcca95168c8de1a2bd4