From 380b8c5c43e6ce518d82d87a968c24d4c1db6daa Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Mon, 9 Jun 2003 14:47:29 +0000 Subject: [PATCH] resolve conflict, because this file (in slightly different but compatible version) is also in nessus-tool --- nessus-libs/nessus-libs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nessus-libs/nessus-libs.spec b/nessus-libs/nessus-libs.spec index 14d589de7e..a898628cef 100644 --- a/nessus-libs/nessus-libs.spec +++ b/nessus-libs/nessus-libs.spec @@ -114,6 +114,7 @@ AutoReqProv: no # strip down installation rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin/uninstall-nessus + rm -f $RPM_BUILD_ROOT%{l_prefix}/include/nessus/includes.h strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true # determine installation files