From 008f64504527473ef567054d34426e7e5fc23388 Mon Sep 17 00:00:00 2001 From: h00465007 Date: Sat, 14 Mar 2020 15:46:11 +0800 Subject: [PATCH] disable python2 --- python-blivet.spec | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/python-blivet.spec b/python-blivet.spec index d380834..856436b 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,6 +1,8 @@ +%bcond_with enable_python2 + Name: python-blivet Version: 3.1.1 -Release: 5 +Release: 6 Epoch: 1 Summary: A python module for system storage configuration License: LGPLv2+ @@ -10,7 +12,7 @@ Source0: http://github.com/storaged-project/blivet/archive/blivet-%{versi BuildArch: noarch BuildRequires: systemd gettext python3-devel python3-setuptools -%if %{with_python2} +%if %{with enable_python2} BuildRequires: python2-devel python2-setuptools %endif @@ -43,7 +45,7 @@ Recommends: libblockdev-nvdimm >= 2.19 libblockdev-part >= 2.19 libblockdev- Recommends: libblockdev-s390 >= 2.19 %{?python_provide:%python_provide python3-blivet} Obsoletes: blivet-data < 1:2.0.0 -%if %{without python2} +%if %{without enable_python2} Obsoletes: python2-blivet < 1:2.0.2-2 python-blivet < 1:2.0.2-2 %else Obsoletes: python-blivet < 1:2.0.0 @@ -52,7 +54,7 @@ Obsoletes: python-blivet < 1:2.0.0 %description -n python3-blivet python3 package for blivet -%if %{with python2} +%if %{with enable_python2} %package -n python2-blivet Summary: python2 package for blivet Requires: python2 python2-six python2-pyudev >= 0.18 python2-pyparted >= 3.10.4 @@ -77,11 +79,16 @@ python2 package for blivet %autosetup -n blivet-%{version} -p1 %build -%{?with_python2:make PYTHON=%{__python2}} + +%if %{with enable_python2} +make PYTHON=%{__python2} +%endif %{?with_python3:make PYTHON=%{__python3}} %install -%{?with_python2:make PYTHON=%{__python2} DESTDIR=%{buildroot} install} +%if %{with enable_python2} +make PYTHON=%{__python2} DESTDIR=%{buildroot} install +%endif %{?with_python3:make PYTHON=%{__python3} DESTDIR=%{buildroot} install} %find_lang blivet @@ -99,7 +106,7 @@ python2 package for blivet %doc examples %{python3_sitelib}/* -%if %{with python2} +%if %{with enable_python2} %files -n python2-blivet %defattr(-,root,root) %license COPYING @@ -112,6 +119,12 @@ python2 package for blivet %doc README %changelog +* Sat Mar 14 2020 hexiujun - 3.1.1-6 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:disable python2 + * Mon Jan 13 2020 openEuler Buildteam - 3.1.1-5 - update software package -- Gitee