From 9b9d6d72a4c258a8a4c50db715d42c8c6b7f0f9f Mon Sep 17 00:00:00 2001 From: lei_ju <983277505@qq.com> Date: Thu, 29 Oct 2020 10:36:04 +0800 Subject: [PATCH] remove python2 subpackage --- python-google-apputils.spec | 48 +++++++------------------------------ 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/python-google-apputils.spec b/python-google-apputils.spec index b3ee4c8..51d7e12 100644 --- a/python-google-apputils.spec +++ b/python-google-apputils.spec @@ -1,30 +1,18 @@ Name: python-google-apputils Version: 0.4.2 -Release: 15 +Release: 16 Summary: Google Application Utilities for Python License: ASL 2.0 URL: https://github.com/google/google-apputils Source0: https://pypi.python.org/packages/source/g/google-apputils/google-apputils-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel python2-setuptools python2-dateutil python2-gflags -BuildRequires: python2-pytz python3-devel python2-mox python3-setuptools -BuildRequires: python2-tools python3-dateutil python3-gflags python3-pytz +BuildRequires: python3-devel python3-setuptools python3-dateutil python3-gflags python3-pytz %description This project is a small collection of utilities for Python applications. It includes some of the same set of utilities used to build and run internal Python apps at Google. -%package -n python2-google-apputils -Summary: Google Application Utilities for Python2 -Requires: python2-dateutil python2-gflags python2-pytz -%{?python_provide:%python_provide python2-google-apputils} - -%description -n python2-google-apputils -This project is a small collection of utilities for Python2 applications. -It includes some of the same set of utilities used to build and -run internal Python apps at Google. - %package -n python3-google-apputils Summary: Google Application Utilities for Python3 Requires: python3-dateutil python3-gflags python3-pytz @@ -34,51 +22,31 @@ This project is a small collection of utilities for Python3 applications. It includes some of the same set of utilities used to build and run internal Python apps at Google. - %prep %autosetup -c -mv google-apputils-%{version} python2 -find -name \*.py | xargs sed -i '/^#!\/usr\/bin\/.*python/d' -sed -i 's/pytz>.*"/pytz"/' python2/setup.py -cp -a python2 python3 +mv google-apputils-%{version} python3 2to3 --write --nobackups python3 - %build -cd python2 -%py2_build -cd - cd python3 %py3_build -cd - - +cd .. %install cd python3 %{__python3} setup.py install --skip-build --root %{buildroot} -cd - - -cd python2 -%{__python2} setup.py install --skip-build --root %{buildroot} -cd - - +cd .. %check -cd python2 -%{__python2} setup.py test -cd - - -%files -n python2-google-apputils -%license python2/LICENSE -%doc python2/README -%{python2_sitelib}/* %files -n python3-google-apputils %license python3/LICENSE %doc python3/README %{python3_sitelib}/* - %changelog +* Wed Oct 21 2020 leiju4 0.4.2-16 +- remove python2 subpackage + * Wed Jan 8 2020 zhujunhao 0.4.2-15 - Package init