OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2003 16:47:29
Branch: HEAD Handle: 2003060915472900
Modified files:
openpkg-src/nessus-libs nessus-libs.spec
Log:
resolve conflict, because this file (in slightly different but
compatible version) is also in nessus-tool
Summary:
Revision Changes Path
1.11 +1 -0 openpkg-src/nessus-libs/nessus-libs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nessus-libs/nessus-libs.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 nessus-libs.spec
--- openpkg-src/nessus-libs/nessus-libs.spec 9 Jun 2003 13:57:25 -0000 1.10
+++ openpkg-src/nessus-libs/nessus-libs.spec 9 Jun 2003 14:47:29 -0000 1.11
@@ -114,6 +114,7 @@
# 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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
