[nmap] bundled lua no longer required
Michal Hlavinka
mhlavink at fedoraproject.org
Mon Jul 22 08:35:03 UTC 2013
commit 4ae8c473f19d1922b3cbc211e25f775e1668ad30
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Mon Jul 22 10:34:52 2013 +0200
bundled lua no longer required
nmap.spec | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/nmap.spec b/nmap.spec
index b5b0a4f..45a034d 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -4,7 +4,7 @@ Name: nmap
Epoch: 2
Version: 6.25
#global prerelease TEST5
-Release: 6.20130624svn%{?dist}
+Release: 7%{?dist}
# nmap is GPLv2
# zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet)
# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) with some parts as Public Domain (crc32)
@@ -41,9 +41,6 @@ BuildRequires: openssl-devel, gtk2-devel, lua-devel, libpcap-devel, pcre-devel
BuildRequires: desktop-file-utils, dos2unix
BuildRequires: libtool, automake, autoconf, gettext-devel
-# exception granted in FPC ticket 255
-Provides: bundled(lua) = 5.2
-
%define pixmap_srcdir zenmap/share/pixmaps
%description
@@ -101,9 +98,7 @@ autoreconf -I . -fiv --no-recursive
cd nping; autoreconf -I .. -fiv --no-recursive; cd ..
#be sure we're not using tarballed copies of some libraries
-#rm -rf liblua libpcap libpcre macosx mswin32
-rm -rf libpcap libpcre macosx mswin32
-
+rm -rf liblua libpcap libpcre macosx mswin32
#fix locale dir
mv zenmap/share/zenmap/locale zenmap/share
@@ -231,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xnmap.1.gz
%changelog
+* Mon Jul 22 2013 Michal Hlavinka <mhlavink at redhat.com> - 2:6.25-7
+- bundled lua no longer required
+
* Mon Jun 24 2013 Michal Hlavinka <mhlavink at redhat.com> - 2:6.25-6.20130624svn
- use svn snapshot that contains all necessary UDP patches
More information about the scm-commits
mailing list