Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/znc

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

sources

@@ -1 +1,2 @@
-SHA512 (znc-1.7.4.tar.gz) = ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
+SHA512 (znc-1.8.2.tar.gz) = e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
+SHA512 (znc-1.8.2.tar.gz.sig) = c4fb2817a54155cef19702e3f48ba845350209019445d7b056d303c708ddf8931eea308a0ec84d58f02be0cb932b663c3d2a732c48112205dbe953f8b08423cb

znc.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=ZNC - an advanced IRC bouncer
-After=network.target
+After=network-online.target
 
 [Service]
 ExecStart=/usr/bin/znc

znc.spec

@@ -1,7 +1,3 @@
-# This package depends on automagic byte compilation
-# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
-%global _python_bytecompile_extra 1
-
 # ZNC is a daemon application and that's why needs hardening
 %global _hardened_build 1
 
@@ -16,14 +12,14 @@
 %endif # 0%{?fedora} || 0%{?rhel} >= 7
 
 Name:           znc
-Version:        1.7.4
-Release:        2%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Summary:        An advanced IRC bouncer
 
 License:        ASL 2.0
 URL:            https://znc.in
-Source0:        %{url}/releases/%{name}-%{version}.tar.gz
-Source1:        %{url}/releases/%{name}-%{version}.tar.gz.sig
+Source0:        %{url}/releases/archive/%{name}-%{version}.tar.gz
+Source1:        %{url}/releases/archive/%{name}-%{version}.tar.gz.sig
 
 Source2:        gpgkey-5AE420CC0209989E.asc
 # Use system-wide crypto policy
@@ -97,19 +93,11 @@ Provides:      perl(ZNC::Module) = %{version}-%{release}
 %package modpython
 Summary:       Python3 module for ZNC
 
-%if 0%{?rhel}
-BuildRequires: python34-devel
-%else
-BuildRequires: python3-devel
-%endif # 0%{?rhel}
+BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: swig
 
 Requires:      %{name} = %{version}-%{release}
-%if 0%{?rhel}
-Requires:      python34
-%else
-Requires:      python3
-%endif # 0%{?rhel}
+Requires:      python%{python3_pkgversion}
 
 %description modpython
 %{summary}.
@@ -125,6 +113,8 @@ 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
 
 # The manual page references /usr/local/; fix that
 sed -ie 's!/usr/local/!/usr/!' man/znc.1
@@ -150,6 +140,7 @@ sed -ie 's!/usr/local/!/usr/!' man/znc.1
 %install
 %make_install
 install -d "%{buildroot}%{_sharedstatedir}/znc"
+%py_byte_compile %{__python3} %{buildroot}%{_libdir}/znc/
 
 
 %pre
@@ -221,6 +212,50 @@ getent passwd znc >/dev/null || \
 
 
 %changelog
+* Thu Oct 01 2020 Nick Bebout <nb@fedoraproject.org> - 1.8.2-1
+- Update to 1.8.2
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.1-2
+- Perl 5.32 rebuild
+
+* Fri Jun 19 2020 Nick Bebout <nb@fedoraproject.org> - 1.8.1-1
+- Update to 1.8.1
+- Fix CVE-2020-13775 possible crash/NULL pointer dereference
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-2
+- Rebuilt for Python 3.9
+
+* Wed May 20 2020 Nick Bebout <nb@fedoraproject.org> - 1.8.0-1
+- Update to 1.8.0
+- Fix systemd unit file to require network-online.target
+
+* Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 1.7.5-5
+- Rebuild for ICU 67
+
+* Mon Apr 20 2020 Robert Scheck <robert@fedoraproject.org> - 1.7.5-4
+- Modernize spec file slightly for building on RHEL/CentOS 7 and 8
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 1.7.5-2
+- Rebuild for ICU 65
+
+* Fri Sep 27 2019 Nick Bebout <nb@fedoraproject.org> - 1.7.5-1
+- Update to 1.7.5
+
+* Mon Sep 23 2019 Nick Bebout <nb@fedoraproject.org> - 1.7.5-0.1
+- Update to 1.7.5-rc1
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.4-4
+- Rebuilt for Python 3.8
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.4-3
+- Rebuilt for Python 3.8
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild