From 53f2940399c4ccdd920af519c141ba6b11c10d50 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Fri, 20 Aug 2021 03:38:34 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20'Pull=20Request=20!4=20:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dpython-jenkins=E8=BD=AF=E4=BB=B6=E5=8C=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bugfix.patch | 10 ---- python-jenkins.spec | 119 +++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 77 deletions(-) delete mode 100644 bugfix.patch diff --git a/bugfix.patch b/bugfix.patch deleted file mode 100644 index 1ccd21b..0000000 --- a/bugfix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur python-jenkins-1.7.0_old/setup.py python-jenkins-1.7.0/setup.py ---- python-jenkins-1.7.0_old/setup.py 2021-08-20 10:10:28.910000000 +0800 -+++ python-jenkins-1.7.0/setup.py 2020-03-04 11:06:09.000000000 +0800 -@@ -1,3 +1,5 @@ - import setuptools - --setuptools.setup() -+setuptools.setup( -+ setup_requires=['pbr'], -+ pbr=True) diff --git a/python-jenkins.spec b/python-jenkins.spec index 9b0bffc..9873618 100644 --- a/python-jenkins.spec +++ b/python-jenkins.spec @@ -1,93 +1,78 @@ +%global _empty_manifest_terminate_build 0 Name: python-jenkins Version: 1.7.0 -Release: 2 +Release: 1 Summary: Python bindings for the remote Jenkins API License: BSD URL: http://git.openstack.org/cgit/openstack/python-jenkins Source0: https://files.pythonhosted.org/packages/85/8e/52223d8eebe35a3d86579df49405f096105328a9d80443eaed809f6c374f/python-jenkins-1.7.0.tar.gz -Patch1: bugfix.patch +BuildArch: noarch -BuildRequires: python3-sphinx -BuildArch: noarch +Requires: python3-six +Requires: python3-pbr +Requires: python3-multi-key-dict +Requires: python3-requests %description -Python Jenkins is a library for the remote API of the Jenkins continuous -integration server. It is useful for creating and managing jobs as well as -build nodes. - +Python Jenkins is a python wrapper for the REST API which aims to provide a more +conventionally pythonic way of controlling a Jenkins server. %package -n python3-jenkins -Summary: %{summary} -BuildRequires: python3-devel -BuildRequires: python3-kerberos -BuildRequires: python3-mock -BuildRequires: python3-multi_key_dict -BuildRequires: python3-nose -BuildRequires: python3-pbr >= 0.8.2 -BuildRequires: python3-requests -BuildRequires: python3-requests-mock -BuildRequires: python3-setuptools -BuildRequires: python3-six >= 1.3.0 -BuildRequires: python3-testscenarios -BuildRequires: python3-testtools -%{?python_provide:%python_provide python3-jenkins} - -%if %{undefined __pythondist_requires} -Requires: python3-multi_key_dict -Requires: python3-pbr >= 0.8.2 -Requires: python3-requests -Requires: python3-six >= 1.3.0 -%endif - -Recommends: python3-kerberos +Summary: Python bindings for the remote Jenkins API +Provides: python-jenkins +BuildRequires: python3-devel +BuildRequires: python3-setuptools %description -n python3-jenkins -Python Jenkins is a library for the remote API of the Jenkins continuous -integration server. It is useful for creating and managing jobs as well as -build nodes. +Python Jenkins provides a higher-level API containing a number of convenience functions. +%package help +Summary: Development documents and examples for python-jenkins +Provides: python3-jenkins-doc +%description help +Python Jenkins provide a more conventionally pythonic way of controlling +a Jenkins server. %prep -%autosetup -n python-jenkins-1.7.0 -p1 - -# Remove env from __init__.py -sed -i '1{s|^#!/usr/bin/env python||}' jenkins/__init__.py - +%autosetup -n python-jenkins-1.7.0 %build -export PBR_VERSION=%{version} - %py3_build -PYTHONDONTWRITEBYTECODE=1 \ - PYTHONPATH=$PWD \ - %make_build -C doc html man -rm doc/build/html/.buildinfo - - %install -export PBR_VERSION=%{version} - %py3_install - -install -D -m0644 -p doc/build/man/pythonjenkins.1 %{buildroot}%{_mandir}/man1/pythonjenkins.1 - - -%check -%{__python3} -m testtools.run discover tests - - -%files -n python3-jenkins -%doc README.rst doc/build/html -%license COPYING -%{python3_sitelib}/jenkins/ -%{python3_sitelib}/python_jenkins-%{version}-py%{python3_version}.egg-info/ -%{_mandir}/man1/pythonjenkins.1.* - +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 . + +%files -n python3-jenkins -f filelist.lst +%dir %{python3_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Fri Aug 20 2021 Pengju Jiang - 1.7.0-2 -- bugfix-of-gcc-10.patch - * Tue Jul 27 2021 Python_Bot - 1.7.0-1 - Package Spec generated -- Gitee