rpm/openvswitch
SHA256
1
0
Fork 0
forked from pool/openvswitch
Code Pull Requests Activity

Accepting request 554830 from home:markoschandras:network

Browse Source 
- 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
This commit is contained in:
Dirk Mueller 2017-12-06 14:50:41 +00:00 committed by Git OBS Bridge
parent 5c4aa62ebd
commit 8283839e08
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvswitch.changes
View File

@ -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 Thu Nov 23 13:38:56 UTC 2017 - rbrown@suse.com

22
openvswitch.spec
View File

@ -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 \ install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \
%{buildroot}%{_prefix}/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 # Copy documentation.
# 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/
mkdir -p %{buildroot}%{_docdir}/%{name} mkdir -p %{buildroot}%{_docdir}/%{name}
cp -r * %{buildroot}%{_docdir}/%{name} cp -r Documentation/* %{buildroot}%{_docdir}/%{name}
popd find %{buildroot}%{_docdir}/%{name}/ -type f ! -name '*.rst' -delete
# DPDK migration script # DPDK migration script
install -m 755 utilities/ovs-dpdk-migrate-2.6.sh %{buildroot}/%{_datadir}/openvswitch/scripts/ 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 %endif
%files doc %files doc
%exclude %{_docdir}/AUTHORS.rst %exclude %{_docdir}/%{name}/AUTHORS.rst
%exclude %{_docdir}/CONTRIBUTING.rst %exclude %{_docdir}/%{name}/CONTRIBUTING.rst
%exclude %{_docdir}COPYING %exclude %{_docdir}/%{name}/COPYING
%exclude %{_docdir}/NEWS %exclude %{_docdir}/%{name}/NEWS
%exclude %{_docdir}/NOTICE %exclude %{_docdir}/%{name}/NOTICE
%exclude %{_docdir}/README.rst %exclude %{_docdir}/%{name}/README.rst
%{_docdir}/%{name}/ %{_docdir}/%{name}/
%files -n %{lname} %files -n %{lname}