From 73e0a34373a1dc54729f044b642f208d7f13cf64 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Oct 07 2018 13:24:40 +0000 Subject: Drop python2 support --- diff --git a/python-xapp.spec b/python-xapp.spec index aa88cbd..f8c12c4 100644 --- a/python-xapp.spec +++ b/python-xapp.spec @@ -1,18 +1,9 @@ -%if 0%{?fedora} || 0%{?rhel} >= 7 -%bcond_without python3 -%else # 0#{?fedora} || 0#{?rhel} >= 7 -%bcond_with python3 -%endif # 0#{?fedora} || 0#{?rhel} >= 7 - -# this is only turned on during transitional periods -%{?python3_next_pkgversion: %global with_python3_next 1} - %global sum Python bindings for xapps Name: python-xapp Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: LGPLv2 @@ -25,63 +16,16 @@ BuildArch: noarch %{sum}. -%package -n python2-xapp -Summary: %{sum} - -BuildRequires: python2-devel - -%if 0%{?fedora} || 0%{?rhel} >= 8 -BuildRequires: python2-setuptools -Requires: python2-psutil -%else # 0#{?fedora} || 0#{?rhel} >= 8 -BuildRequires: python-setuptools -Requires: python-psutil -%endif # 0#{?fedora} || 0#{?rhel} >= 8 - -%{?python_provide:%python_provide python2-xapp} - -%description -n python2-xapp -%{sum}. - - -%if %{with python3} -%package -n python%{python3_pkgversion}-xapp -Summary: %{sum} - -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools - -Requires: python%{python3_pkgversion}-psutil - -%{?python_provide:%python_provide python%{python3_pkgversion}-xapp} - -%if ("python%{python3_pkgversion}-xapp" != "python3-xapp") && !0%{?with_python3_next} -Provides: python3-xapp = %{version}-%{release} -%endif - -%description -n python%{python3_pkgversion}-xapp -%{sum}. -%endif # with python3 - - -%if 0%{?with_python3_next} -%package -n python%{python3_next_pkgversion}-xapp +%package -n python3-xapp Summary: %{sum} -BuildRequires: python%{python3_next_pkgversion}-devel -BuildRequires: python%{python3_next_pkgversion}-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools -Requires: python%{python3_next_pkgversion}-psutil +Requires: python3-psutil -%{?python_provide:%python_provide python%{python3_next_pkgversion}-xapp} - -%if ("python%{python3_next_pkgversion}-xapp" != "python3-xapp") && 0%{?with_python3_next} -Provides: python3-xapp = %{version}-%{release} -%endif - -%description -n python%{python3_next_pkgversion}-xapp +%description -n python3-xapp %{sum}. -%endif # with_python3_next %prep @@ -89,51 +33,25 @@ Provides: python3-xapp = %{version}-%{release} %build -%py2_build -%if %{with python3} %py3_build -%endif # with python3 -%if 0%{?with_python3_next} -%py3_next_build -%endif # with_python3_next %install -%py2_install -%if %{with python3} %py3_install -%endif # with python3 -%if 0%{?with_python3_next} -%py3_next_install -%endif # with_python3_next -%files -n python2-xapp -%license COPYING debian/copyright -%doc AUTHORS PKG-INFO README TODO debian/changelog -%{python2_sitelib}/xapp -%{python2_sitelib}/python_xapp-%{version}-py%{python2_version}.egg-info - - -%if %{with python3} -%files -n python%{python3_pkgversion}-xapp +%files -n python3-xapp %license COPYING debian/copyright %doc AUTHORS PKG-INFO README TODO debian/changelog %{python3_sitelib}/xapp %{python3_sitelib}/python_xapp-%{version}-py%{python3_version}.egg-info -%endif # with python3 - - -%if 0%{?with_python3_next} -%files -n python%{python3_next_pkgversion}-xapp -%license COPYING debian/copyright -%doc AUTHORS PKG-INFO README TODO debian/changelog -%{python3_next_sitelib}/xapp -%{python3_next_sitelib}/python_xapp-%{version}-py%{python3_next_version}.egg-info -%endif # with_python3_next %changelog +* Sun Oct 07 2018 Leigh Scott - 1.2.0-4 +- Drop EPEL/RHEL support +- Drop python2 support + * Sat Jul 14 2018 Fedora Release Engineering - 1.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild