| |
@@ -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
|
| |
|
| |
@@ -17,7 +13,7 @@
|
| |
|
| |
Name: znc
|
| |
Version: 1.7.5
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
Summary: An advanced IRC bouncer
|
| |
|
| |
License: ASL 2.0
|
| |
@@ -97,19 +93,19 @@
|
| |
%package modpython
|
| |
Summary: Python3 module for ZNC
|
| |
|
| |
- %if 0%{?rhel}
|
| |
+ %if 0%{?rhel} == 7
|
| |
BuildRequires: python34-devel
|
| |
%else
|
| |
BuildRequires: python3-devel
|
| |
- %endif # 0%{?rhel}
|
| |
+ %endif # 0%{?rhel} == 7
|
| |
BuildRequires: swig
|
| |
|
| |
Requires: %{name} = %{version}-%{release}
|
| |
- %if 0%{?rhel}
|
| |
+ %if 0%{?rhel} == 7
|
| |
Requires: python34
|
| |
%else
|
| |
Requires: python3
|
| |
- %endif # 0%{?rhel}
|
| |
+ %endif # 0%{?rhel} == 7
|
| |
|
| |
%description modpython
|
| |
%{summary}.
|
| |
@@ -153,6 +149,10 @@
|
| |
%make_install
|
| |
install -d "%{buildroot}%{_sharedstatedir}/znc"
|
| |
|
| |
+ %if 0%{?with_modpython}
|
| |
+ %py_byte_compile %{__python} %{_libdir}/znc/*.py
|
| |
+ %py_byte_compile %{__python} %{_libdir}/znc/modpython/*.py
|
| |
+ %endif # 0%{?with_modpython}
|
| |
|
| |
%pre
|
| |
getent group znc >/dev/null || groupadd -r znc
|
| |
@@ -223,6 +223,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Tue Jan 21 2020 Marcel Metz <mmetz@adrian-broher.net> - 1.7.5-3
|
| |
+ - Explicit byte compilation of python module scripts
|
| |
+ - Use python3 requirement for EPEL 8
|
| |
+
|
| |
* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 1.7.5-2
|
| |
- Rebuild for ICU 65
|
| |
|
| |
mtz
commented 4 years ago
Hi,
this PR implements the changes required to build znc for the EPEL 8 repository.