!9 【更新版本】更新master分支到最新的发布版本18.8.0

From: @kkzhs_admin 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu

python-cherrypy.spec

@@ -1,56 +1,118 @@
-%define with_check 0
-%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%global _empty_manifest_terminate_build 0
+Name:		python-cherrypy
+Version:	18.8.0
+Release:	1
+Summary:	Object-Oriented HTTP framework
+License:        BSD-3-Clause
+URL:		https://www.cherrypy.org
+Source0:	https://files.pythonhosted.org/packages/60/ea/6c4d16b0cd1f4f64a478bac8a37d75a585e854afb5693ce80a9711efdc4a/CherryPy-%{version}.tar.gz
+BuildArch:	noarch
+BuildRequires:  python-setuptools_scm
+Recommends:     %{name}-help = %{version}-%{release}
 
-Name:           python-cherrypy
-Version:        3.5.0
-Release:        11
-Summary:        Pythonic, object-oriented web development framework
-License:        BSD
-URL:            https://cherrypy.org
-Source0:        http://www.gitbuilder.ceph.com/pypi/packages/source/C/CherryPy/CherryPy-3.5.0.tar.gz
-BuildArch:      noarch
-BuildRequires:  python2-devel python2-setuptools python2-nose
+Requires:	python3-cheroot
+Requires:	python3-portend
+Requires:	python3-more-itertools
+Requires:	python3-pywin32
+Requires:	python3-sphinx
+Requires:	python3-docutils
+Requires:	python3-alabaster
+Requires:	python3-simplejson
+Requires:	python3-memcached
+Requires:	python3-routes
+Requires:	python3-pyOpenSSL
+Requires:	python3-coverage
+Requires:	python3-codecov
+Requires:	python3-objgraph
+Requires:	python3-pytest
+Requires:	python3-pytest-cov
+Requires:	python3-pytest-sugar
+Requires:	python3-requests-toolbelt
+Requires:	python3-pytest-services
+Requires:	python3-flup
 
 %description
-CherryPy allows developers to build web applications in much the same way
-they would build any other object-oriented Python program. This usually
-results in smaller source code developed in less time.
+CherryPy is available as part of the Tidelift Subscription.
+The CherryPy maintainers and the maintainers of thousands of other packages
+are working with Tidelift to deliver one enterprise subscription that covers
+all of the open source you use.
+`Learn more <https://tidelift.com/subscription/pkg/pypi-cherrypy?utm_source=pypi-cherrypy&utm_medium=referral&utm_campaign=github>`_.
 
-%package        -n python2-cherrypy
-Summary:        Pythonic, object-oriented web development framework
-%python_provide python2-cherrypy
-%python_provide python-cherrypy
+%package -n python3-cherrypy
+Summary:	Object-Oriented HTTP framework
+Provides:	python-cherrypy
+BuildRequires:	python3-devel
+BuildRequires:	python3-setuptools
+%description -n python3-cherrypy
+CherryPy is available as part of the Tidelift Subscription.
+The CherryPy maintainers and the maintainers of thousands of other packages
+are working with Tidelift to deliver one enterprise subscription that covers
+all of the open source you use.
+`Learn more <https://tidelift.com/subscription/pkg/pypi-cherrypy?utm_source=pypi-cherrypy&utm_medium=referral&utm_campaign=github>`_.
 
-%description    -n python2-cherrypy
-CherryPy allows developers to build web applications in much the same way
-they would build any other object-oriented Python program. This usually
-results in smaller source code developed in less time.
+%package help
+Summary:	Development documents and examples for CherryPy
+Provides:	python3-cherrypy-doc
+%description help
+CherryPy is available as part of the Tidelift Subscription.
+The CherryPy maintainers and the maintainers of thousands of other packages
+are working with Tidelift to deliver one enterprise subscription that covers
+all of the open source you use.
+`Learn more <https://tidelift.com/subscription/pkg/pypi-cherrypy?utm_source=pypi-cherrypy&utm_medium=referral&utm_campaign=github>`_.
 
 %prep
 %autosetup -n CherryPy-%{version}
-sed -i 's/\r//' cherrypy/tutorial/tutorial.conf
 
 %build
-%{__python} setup.py build
+%py3_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%py3_install
+install -d -m755 %{buildroot}/%{_pkgdocdir}
+if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
+if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
+if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi
+if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi
+pushd %{buildroot}
+if [ -d usr/lib ]; then
+	find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/lib64 ]; then
+	find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/bin ]; then
+	find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+if [ -d usr/sbin ]; then
+	find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst
+fi
+touch doclist.lst
+if [ -d usr/share/man ]; then
+	find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst
+fi
+popd
+mv %{buildroot}/filelist.lst .
+mv %{buildroot}/doclist.lst .
 
-%check
-%if 0%{?with_check}
-cd cherrypy/test
-PYTHONPATH='../../' nosetests -s ./ -e 'test_SIGTERM' -e 'test_SIGHUP_tty' \
-                                    -e 'test_file_stream'  -e 'test_no_content_length'
-%endif
+%files -n python3-cherrypy -f filelist.lst
+%dir %{python3_sitelib}/*
 
-%files -n python2-cherrypy
-%defattr(-,root,root,-)
-%doc README.txt cherrypy/tutorial
-%{_bindir}/cherryd
-%{python_sitelib}/*
+%files help -f doclist.lst
+%{_docdir}/*
 
 %changelog
+* Tue Aug 02 2022 zhaoshuag <zhaoshuang@uniontech.com> - 18.8.0-1
+- update to 18.8.0
+
+* Wed May 11 2022 yangping <yangping69@h-partners> - 18.6.0-2
+- License compliance rectification
+
+* Mon Nov 16 2020 caodongxia <caodongxia@huawei.com> - 18.6.0-1
+- update to remove python2 subPackage
+
+* Tue Mar 17 2020 zoushuangshuang <zoushuangshuang@huawei.com> - 3.5.0-12
+- modify provide: python-cherrypy
+
 * Tue Mar 17 2020 zoushuangshuang <zoushuangshuang@huawei.com> - 3.5.0-11
 - add provide: python-cherrypy