OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 18-Oct-2009 10:33:10 Branch: HEAD Handle: 2009101809330900 Added files: openpkg-src/nmap nmap.patch Modified files: openpkg-src/nmap nmap.spec Log: fix location of ndiff.1 file Summary: Revision Changes Path 1.6 +10 -0 openpkg-src/nmap/nmap.patch 1.101 +5 -3 openpkg-src/nmap/nmap.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/nmap/nmap.patch ============================================================================ $ cvs diff -u -r0 -r1.6 nmap.patch --- /dev/null 2009年10月18日 10:33:10 +0200 +++ nmap.patch 2009年10月18日 10:33:10 +0200 @@ -0,0 +1,10 @@ +Index: ndiff/setup.py +--- ndiff/setup.py.orig 2009年06月24日 23:35:54 +0200 ++++ ndiff/setup.py 2009年10月18日 10:27:48 +0200 +@@ -29,5 +29,5 @@ + + "Installing your distribution's python-dev package may solve this problem.") + + distutils.core.setup(name = u"ndiff", scripts = [u"ndiff"], +- data_files = [(u"share/man/man1", [u"docs/ndiff.1"])], ++ data_files = [(u"man/man1", [u"docs/ndiff.1"])], + cmdclass = {"install_egg_info": null_command, "install": checked_install}) @@ . patch -p0 <<'@@ .' Index: openpkg-src/nmap/nmap.spec ============================================================================ $ cvs diff -u -r1.100 -r1.101 nmap.spec --- openpkg-src/nmap/nmap.spec 17 Jul 2009 21:57:50 -0000 1.100 +++ openpkg-src/nmap/nmap.spec 18 Oct 2009 08:33:09 -0000 1.101 @@ -32,18 +32,19 @@ Group: Mapping License: GPL Version: 5.00 -Release: 20090717 +Release: 20091018 # list of sources Source0: http://nmap.org/dist/nmap-%{version}.tar.bz2 +Patch0: nmap.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20050615, make, gcc, gcc::with_cxx = yes, bison, flex PreReq: OpenPKG, openpkg >= 20050615 -BuildPreReq: libpcap, openssl, getopt, pcre -PreReq: libpcap, openssl, getopt, pcre +BuildPreReq: python, libpcap, openssl, getopt, pcre +PreReq: python, libpcap, openssl, getopt, pcre AutoReq: no AutoReqProv: no @@ -67,6 +68,7 @@ %prep %setup -q + %patch -p0 %{l_shtool} subst \ -e 's;/usr/local/;%{l_prefix}/;g' \ configure */configure @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]