From 7a9b8c653b0fb504a55cfcd5103e24d771bca088 Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Feb 19 2018 11:16:56 +0000
Subject: release 1.6


---

diff --git a/.gitignore b/.gitignore
index 9788944..90236d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /dist-git-1.3.tar.gz
 /dist-git-1.4.tar.gz
 /dist-git-1.5.tar.gz
+/dist-git-1.6.tar.gz
diff --git a/dist-git.spec b/dist-git.spec
index bcdd247..a4fd36f 100644
--- a/dist-git.spec
+++ b/dist-git.spec
@@ -3,8 +3,8 @@
 %global installdir /var/lib/dist-git
 
 Name:           dist-git
-Version:        1.5
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Package source version control system
 
 # upload.cgi uses GPLv1
@@ -17,24 +17,34 @@ URL:            https://github.com/release-engineering/dist-git
 Source0:        %{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-Patch0: ensure_gitrepo_namespaced.patch
-
 BuildRequires:  systemd
 
 Requires:       httpd
 Requires:       perl(Sys::Syslog)
+Requires:       dist-git-selinux
 Requires:       git
 Requires:       git-daemon
-Requires:       python-requests
-Requires:       python-configparser
 Requires:       mod_ssl
 Requires:       fedmsg
 Requires:       crudini
 Requires:       moreutils
 Requires(pre):  shadow-utils
 
-%if 0%{?fedora}
-Suggests:       python-grokmirror
+%if 0%{?rhel} && 0%{?rhel} < 8
+Requires:       python-requests
+Requires:       python-configparser
+Requires:       python-grokmirror
+
+%else
+Requires:       python2-requests
+Requires:       python2-configparser
+
+%if 0%{?fedora} < 28
+Recommends:     python-grokmirror
+%else
+Recommends:     python2-grokmirror
+%endif
+
 %endif
 
 %description
@@ -67,7 +77,7 @@ This package includes SELinux support.
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 # ------------------------------------------------------------------------------
@@ -213,19 +223,18 @@ fi
 
 
 %changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Mon Feb 19 2018 clime <clime@redhat.com> 1.6-1
+- add 'fedmsgs', 'old_paths', and 'default_namespace' config options
+- remove domain_read_all_domains_state SELinux rule
+- require dist-git-selinux
+- give optional map permission to git_system_t on git_user_content_t
+- update requires to work for all environments
+- make the package completely distribution-agnostic
 
 * Mon Dec 18 2017 clime <clime@redhat.com> 1.5-1
 - make selinux policy build on f27+
 - add optional map SELinux permission for httpd_t
 
-* Thu Oct 26 2017 clime <clime@redhat.com> 1.4-3
-- add ensure_gitrepo_namespaced patch
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> 1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Tue Jul 25 2017 clime <clime@redhat.com> 1.4-1
 - disable md5 uploading by default
 
@@ -251,6 +260,7 @@ fi
 - updated setup_git_package, mkbranch, mkbranch_branching
 - updated SELinux policy
 - configurable paths to cache dir and git repos
+
 * Wed Aug 05 2015 Adam Samalik <asamalik@redhat.com> 0.13-1
 - optional cgit_pkg_list.sh parameter (asamalik@redhat.com)
 - change mv to cp + rm (asamalik@redhat.com)
diff --git a/ensure_gitrepo_namespaced.patch b/ensure_gitrepo_namespaced.patch
deleted file mode 100644
index e440166..0000000
--- a/ensure_gitrepo_namespaced.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 15ec38ca2cb761ca02eb75d6a31565f894bf2f00 Mon Sep 17 00:00:00 2001
-From: clime <clime@redhat.com>
-Date: Thu, 26 Oct 2017 17:06:04 +0200
-Subject: [PATCH] patch for Fedora
-
----
- scripts/httpd/upload.cgi | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/httpd/upload.cgi b/scripts/httpd/upload.cgi
-index 1de12a3..78f3ba9 100644
---- a/scripts/httpd/upload.cgi
-+++ b/scripts/httpd/upload.cgi
-@@ -91,6 +91,13 @@ def makedirs(dir_, username, mode=02755):
-             send_error(str(e))
- 
- 
-+def ensure_namespaced(name):
-+    name_parts = name.split('/')
-+    if len(name_parts) == 1:
-+        return 'rpms/'+name
-+    return name
-+
-+
- def main():
-     config = ConfigParser()
-     config.read('/etc/dist-git/dist-git.conf')
-@@ -165,7 +172,7 @@ def main():
-     msgpath = os.path.join(name, filename, hash_type, checksum, filename)
- 
-     # first test if the module really exists
--    git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % name)
-+    git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % ensure_namespaced(name))
-     if not os.path.isdir(git_dir):
-         sys.stderr.write('[username=%s] Unknown module: %s' % (username, name))
-         send_error('Module "%s" does not exist!' % name,
--- 
-2.9.5
-
diff --git a/sources b/sources
index 1badd0e..0d65f87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dist-git-1.5.tar.gz) = d5278ecfb498c0da0965932a1ed3e9e4893763d6dcf07c1732dbfdcf5ab2d5ba8b60fde8ebe723fd5157ec920abf9171c5a26739800e7ab1eb692b592f39b1f1
+SHA512 (dist-git-1.6.tar.gz) = 1923a83c0affe184b27d8cf3eca01d04b06a01410ca5c89e9d1efb14fc2e84324cb861bd306aec7ed6386d03bba1d2e116c6549ed15d3455f0ba18b4dec43c51