From 2603b21ca8a9195e4800a5021c448868c3c63100 Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 9 Oct 2018 22:38:43 +0800 Subject: [PATCH] de-fuzz python-heatclient patch With rpm version < 4.13, patch cmd will create .orig file for fuzzy patch in default. And this .orig file may lead to rpmbuild failure "error: Installed (but unpackaged) file(s) found:" Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Story: 2003917 Task: 26971 Change-Id: I06a337ef35d7081bfe3c7b5e9069fe0c9275e384 Signed-off-by: slin14 --- ...0002-Packages-sdk-for-remote-clients.patch | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch b/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch index 40db99b2..80bdb619 100644 --- a/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch +++ b/openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch @@ -1,17 +1,17 @@ -From cdb41db222215b7d4576b53d042cf342d9ff6b29 Mon Sep 17 00:00:00 2001 +From e3f1154184f24103942c98fa9373763df49703c7 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:32:49 -0400 -Subject: [PATCH 2/3] WRS: 0002-Packages-sdk-for-remote-clients.patch +Subject: WRS: 0002-Packages-sdk-for-remote-clients.patch --- SPECS/python-heatclient.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SPECS/python-heatclient.spec b/SPECS/python-heatclient.spec -index 8b36981..3060a3f 100644 +index c5ff419..1f44763 100644 --- a/SPECS/python-heatclient.spec +++ b/SPECS/python-heatclient.spec -@@ -93,6 +93,13 @@ the OpenStack Heat API. +@@ -92,6 +92,13 @@ the OpenStack Heat API. This package contains auto-generated documentation. @@ -23,9 +23,9 @@ index 8b36981..3060a3f 100644 + + %prep - %setup -q -n %{name}-%{upstream_version} + %autosetup -n %{name}-%{upstream_version} -S git -@@ -129,6 +136,10 @@ install -pm 644 tools/heat.bash_completion \ +@@ -128,6 +135,10 @@ install -pm 644 tools/heat.bash_completion \ # Delete tests rm -fr %{buildroot}%{python2_sitelib}/heatclient/tests @@ -34,18 +34,18 @@ index 8b36981..3060a3f 100644 +tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version} + - export PYTHONPATH="$( pwd ):$PYTHONPATH" - sphinx-build -b html doc/source html -@@ -167,6 +178,9 @@ rm -fr html/.doctrees html/.buildinfo - %doc html + %{__python2} setup.py build_sphinx -b html + # Fix hidden-file-or-dir warnings +@@ -164,6 +175,9 @@ install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1 + %doc doc/build/html %license LICENSE +%files sdk +/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz + %changelog - * Fri Jul 21 2017 rdo-trunk 1.5.2-1 - - Update to 1.5.2 + * Mon Aug 14 2017 Alfredo Moralejo 1.11.0-1 + - Update to 1.11.0 -- -1.9.1 +2.7.4