From fe79a69047c0e189cef67653c6a9a0e0e26f9238 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Dec 14 2018 11:28:33 +0000
Subject: Sync small packaging fixes from Fedora


There were some fixes for the packaging done in Fedora that were
not present in the upstream packaging spec, which leads to the
upstream spec not quite building a working package.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>

---

diff --git a/files/pagure.spec b/files/pagure.spec
index f8f548c..a8719e9 100644
--- a/files/pagure.spec
+++ b/files/pagure.spec
@@ -42,8 +42,8 @@ Requires:           python%{python_pkgversion}-fedora-flask
 Recommends:         python%{python_pkgversion}-fedora-flask
 %endif
 
-# We require OpenSSH7.4 for SHA256 support
-Conflicts:          openssh<7.4
+# We require OpenSSH 7.4+ for SHA256 support
+Requires:           openssh >= 7.4
 
 %if %{undefined python_enable_dependency_generator}
 Requires:           python%{python_pkgversion}-alembic
@@ -312,6 +312,7 @@ sed -e "s|#!/usr/bin/env python|#!%{__python}|" -i \
     $RPM_BUILD_ROOT/%{_datadir}/pagure/pagure_createdb.py \
     $RPM_BUILD_ROOT/%{_datadir}/pagure/api_key_expire_mail.py \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/*.py \
+    $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/hookrunner \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/post-receive \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/pre-receive \
     $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/repospannerhook
@@ -330,6 +331,13 @@ sed -e "s|/usr/bin/celery|/usr/bin/celery-3|g" -i $RPM_BUILD_ROOT/%{_unitdir}/*.
 sed -e "s/pythonX.Y/python%{python3_version}/g" -i $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/pagure.conf
 %endif
 
+# Regenerate missing symlinks (really needed for upgrades from pagure < 5.0)
+runnerhooks="post-receive pre-receive"
+
+for runnerhook in $runnerhooks; do
+   rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/$runnerhook
+   ln -sf hookrunner $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/$runnerhook
+done
 
 %post
 %systemd_post pagure_worker.service