Merge branch 'master' into epel7

znc.spec

@@ -24,7 +24,7 @@ Source1:        %{url}/releases/archive/%{name}-%{version}.tar.gz.sig
 Source2:        gpgkey-5AE420CC0209989E.asc
 # Use system-wide crypto policy
 # https://fedoraproject.org/wiki/Packaging:CryptoPolicies
-Patch0:         0001-Use-system-wide-crypto-policy.patch
+# Patch0:         0001-Use-system-wide-crypto-policy.patch
 
 BuildRequires:  automake
 BuildRequires:  c-ares-devel
@@ -93,11 +93,19 @@ Provides:      perl(ZNC::Module) = %{version}-%{release}
 %package modpython
 Summary:       Python3 module for ZNC
 
+%if 0%{?rhel}
 BuildRequires: python%{python3_pkgversion}-devel
+%else
+BuildRequires: python3-devel
+%endif # 0%{?rhel}
 BuildRequires: swig
 
 Requires:      %{name} = %{version}-%{release}
+%if 0%{?rhel}
 Requires:      python%{python3_pkgversion}
+%else
+Requires:      python3
+%endif # 0%{?rhel}
 
 %description modpython
 %{summary}.
@@ -112,9 +120,7 @@ gpg2 --dearmor --quiet --batch --yes $key >/dev/null
 gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0}
 rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key
 
-%autosetup -p1
-#%setup -n znc-1.7.5-rc1
-#%patch0 -p1
+%setup
 
 # The manual page references /usr/local/; fix that
 sed -ie 's!/usr/local/!/usr/!' man/znc.1