[ovs-dev] [PATCH] rhel: Fix firewalld additions.

[Russell Bryant]

When I updated this patch for v2, I made some mistakes.  This fixes them.
The first is that we need to create a directory in the rpm build root for
the firewalld service files before we can install them there.  Second,
I made two typos when I updated the patch to use %{_prefix}.

Fixes: 55f36be59122 ("rhel: Firewall service files for OVN.")
Signed-off-by: Russell Bryant <russell at ovn.org>
---
 rhel/openvswitch-fedora.spec.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


I already applied this to master and branch-2.7 as the fixes are obvious enough.
The "install" command was in v1 and it got lost when I adapted it for v2.
The other two changes are obvious typos.


diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 262acd0..1173ade 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -234,6 +234,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
 install -p -m 644 -D selinux/openvswitch-custom.pp \
         $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
 
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/
 install rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
         $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
 install rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \
@@ -524,13 +525,13 @@ fi
 %config %{_datadir}/openvswitch/ovn-nb.ovsschema
 %config %{_datadir}/openvswitch/ovn-sb.ovsschema
 %{_unitdir}/ovn-northd.service
-${_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
+%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
 
 %files ovn-host
 %{_bindir}/ovn-controller
 %{_mandir}/man8/ovn-controller.8*
 %{_unitdir}/ovn-controller.service
-${_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml
+%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml
 
 %files ovn-vtep
 %{_bindir}/ovn-controller-vtep
-- 
2.9.3