[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3b/n] build: avoid stranded files when nwfilter is not built



'make rpm' when client_only is requested reports that nwfilter
files were installed but not packaged.

* libvirt.spec.in (%install): Remove nwfilter files if not used.

Signed-off-by: Eric Blake <eblake redhat com>
---

See my question in 3a/n about whether the change should be done
here or in the makefile.  If in the makefile, then there's probably
a few more of these 'rm' calls in the spec file that are working
around the makefile being unconditional, which we should also
consider as bugs worth fixing in separate patches.

 libvirt.spec.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index e4b8329..78fe6e7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1465,6 +1465,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
 %endif

+%if ! %{with_nwfilter}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml
+%endif
+
 %if ! %{with_lxc}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]