From 8283839e081a74fd2006148bbb790b86762995b91ee775f323ff397500ee0e30 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 6 Dec 2017 14:50:41 +0000
Subject: [PATCH] Accepting request 554830 from home:markoschandras:network

- Fix documentation installation. It's best to install everything to
  %buildroot and then remove the files we don't need instead of the
  other way around since some files need to be present in the source
  directory for the testsuite to run.

OBS-URL: https://build.opensuse.org/request/show/554830
OBS-URL: https://build.opensuse.org/package/show/network/openvswitch?expand=0&rev=131
---
 openvswitch.changes |  8 ++++++++
 openvswitch.spec    | 22 +++++++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/openvswitch.changes b/openvswitch.changes
index 2a38f70..14f8559 100644
--- a/openvswitch.changes
+++ b/openvswitch.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec  6 14:00:55 UTC 2017 - mchandras@suse.de
+
+- Fix documentation installation. It's best to install everything to
+  %buildroot and then remove the files we don't need instead of the
+  other way around since some files need to be present in the source
+  directory for the testsuite to run.
+
 -------------------------------------------------------------------
 Thu Nov 23 13:38:56 UTC 2017 - rbrown@suse.com
 
diff --git a/openvswitch.spec b/openvswitch.spec
index 343b319..98208ec 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -414,14 +414,10 @@ install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-central-firewall-service.
 install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \
         %{buildroot}%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml
 
-# Copy documentation. The git archive builds also contain non rst files
-# to make sure we clean everything we don't need.
-find Documentation/ -type f ! -name '*.rst' -delete
-find Documentation/ -type d -empty -delete
-pushd Documentation/
+# Copy documentation.
 mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -r * %{buildroot}%{_docdir}/%{name}
-popd
+cp -r Documentation/* %{buildroot}%{_docdir}/%{name}
+find %{buildroot}%{_docdir}/%{name}/ -type f ! -name '*.rst' -delete
 
 # DPDK migration script
 install -m 755 utilities/ovs-dpdk-migrate-2.6.sh %{buildroot}/%{_datadir}/openvswitch/scripts/
@@ -615,12 +611,12 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %endif
 
 %files doc
-%exclude %{_docdir}/AUTHORS.rst
-%exclude %{_docdir}/CONTRIBUTING.rst
-%exclude %{_docdir}COPYING
-%exclude %{_docdir}/NEWS
-%exclude %{_docdir}/NOTICE
-%exclude %{_docdir}/README.rst
+%exclude %{_docdir}/%{name}/AUTHORS.rst
+%exclude %{_docdir}/%{name}/CONTRIBUTING.rst
+%exclude %{_docdir}/%{name}/COPYING
+%exclude %{_docdir}/%{name}/NEWS
+%exclude %{_docdir}/%{name}/NOTICE
+%exclude %{_docdir}/%{name}/README.rst
 %{_docdir}/%{name}/
 
 %files -n %{lname}