From f129ebfe8235a2a335e1bd55164e53e5bc763108 Mon Sep 17 00:00:00 2001 From: Thomas Andrejak Date: Sun, 23 Sep 2018 17:23:31 +0200 Subject: [PATCH] Remove Python2 package https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal Also disable test, need to fix #1629893 before enable again --- libpreludedb.spec | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/libpreludedb.spec b/libpreludedb.spec index eb78813..049a9b3 100644 --- a/libpreludedb.spec +++ b/libpreludedb.spec @@ -5,7 +5,7 @@ Name: libpreludedb Version: 4.1.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Framework for easy access to the IDMEF database # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -33,7 +33,6 @@ BuildRequires: pkgconfig(libprelude) >= %{version} BuildRequires: pkgconfig(openssl) BuildRequires: perl-devel BuildRequires: perl-generators -BuildRequires: python2-devel BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pkgconfig(zlib) @@ -75,15 +74,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n preludedb-tools Provides a convenient interface for accessing Prelude alerts. -%package -n python2-preludedb -Summary: Python 2 bindings for preludedb -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python2-prelude -%{?python_provide:%python_provide python2-preludedb} - -%description -n python2-preludedb -Provides python 2 bindings for preludedb. - %package -n python%{python3_pkgversion}-preludedb Summary: Python 3 bindings for preludedb Requires: %{name}%{?_isa} = %{version}-%{release} @@ -135,7 +125,7 @@ Provides documentation for preludedb generated by gtk-doc. --includedir=%{_includedir}/%{name} \ --with-swig \ --with-perl-installdirs=vendor \ - --with-python2 \ + --without-python2 \ --with-python3 \ --enable-gtk-doc \ --with-html-dir=%{_docdir}/%{name}-devel @@ -154,8 +144,9 @@ find %{buildroot} -name '.packlist' -delete chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2pgsql.sh chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh -%check -%make_build check +# Enable test again after fixing #1629893 +#%check +#%make_build check %post -n %{name} -p /sbin/ldconfig %postun -n %{name} -p /sbin/ldconfig @@ -186,13 +177,6 @@ chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh %{_bindir}/preludedb-admin %{_mandir}/man1/preludedb-admin.1.gz -%files -n python2-preludedb -%{python2_sitearch}/_preludedb.*so -%{python2_sitearch}/preludedb-%{version}-py?.?.egg-info -%{python2_sitearch}/preludedb.py -%{python2_sitearch}/preludedb.pyc -%{python2_sitearch}/preludedb.pyo - %files -n python%{python3_pkgversion}-preludedb %{python3_sitearch}/_preludedb.*so %{python3_sitearch}/__pycache__/preludedb.cpython-??.*pyc @@ -220,6 +204,9 @@ chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh %doc ChangeLog README NEWS %changelog +* Sun Sep 23 2018 Thomas Andrejak - 4.1.0-5 +- Remove Python2 packages + * Tue Jul 24 2018 Thomas Andrejak - 4.1.0-4 - Fix FTBFS, #1604645