Author: qboosh Date: Sat Mar 15 00:34:15 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - ac regeneration fixes, together with workaround for libtool 2.2 - zenmap R: python-pygtk-gtk, python-sqlite - added COPYING to doc (important notes there)
---- Files affected: SPECS: nmap.spec (1.133 -> 1.134) ---- Diffs: ================================================================ Index: SPECS/nmap.spec diff -u SPECS/nmap.spec:1.133 SPECS/nmap.spec:1.134 --- SPECS/nmap.spec:1.133 Thu Mar 13 13:40:43 2008 +++ SPECS/nmap.spec Sat Mar 15 01:34:09 2008 @@ -3,7 +3,6 @@ # TODO: # - use system lua51 # - use system libdnet -# - R: for zenmap # - desktop file for zenmap # Summary: Network exploration tool and security scanner @@ -17,7 +16,7 @@ Name: nmap Version: 4.53 Release: 1 -License: GPL +License: GPL v2 Group: Networking Source0: http://www.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2 # Source0-md5: bb203c47f3c234b61d3c4916da7eaa27 @@ -27,10 +26,12 @@ BuildRequires: automake BuildRequires: libpcap-devel BuildRequires: libstdc++-devel +BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: pcre-devel -BuildRequires: python-devel +BuildRequires: python-devel >= 1:2.5 BuildRequires: rpm-pythonprov +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -93,6 +94,8 @@ Summary(pl.UTF-8): Graficzny frontend dla nmapa Group: X11/Applications/Networking Requires: %{name} = %{version}-%{release} +Requires: python-pygtk-gtk >= 2:2.6 +Requires: python-sqlite >= 2.0 Obsoletes: nmap-X11 Obsoletes: nmap-frontend @@ -106,13 +109,19 @@ %setup -q %patch0 -p1 +# should be libtool with added "libtool: @LIBTOOL_DEPS@" rule in fact +# (but the latter would fail due to bug in libtool 2.2) +sed -i -e 's,@LIBTOOL_DEPS@,./libtool,' nselib-bin/Makefile.in + %build -find -type f -name 'configure.ac' | while read CFG; do +cp -f /usr/share/automake/config.sub . +ln -s config/acinclude.m4 libdnet-stripped +%{__libtoolize} +find -type f -name configure.ac -o -name configure.in | while read CFG; do cd $(dirname "$CFG") - cp -f /usr/share/automake/config.sub . %{__aclocal} %{__autoconf} - cd - + cd "$OLDPWD" done CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" \ @@ -138,7 +147,8 @@ %files %defattr(644,root,root,755) -%doc docs/README docs/*.txt CHANGELOG +# note: COPYING contains important notes and clarifications +%doc docs/README docs/*.txt CHANGELOG COPYING %attr(755,root,root) %{_bindir}/nmap %{_libdir}/nmap %{_datadir}/nmap @@ -155,7 +165,7 @@ %{py_sitescriptdir}/higwidgets/*.py[co] %{py_sitescriptdir}/zenmapCore/*.py[co] %{py_sitescriptdir}/zenmapGUI/*.py[co] -%{py_sitescriptdir}/zenmap-*-info +%{py_sitescriptdir}/zenmap-*.egg-info %dir %{_datadir}/zenmap %dir %{_datadir}/zenmap/locale %lang(pt_BR) %{_datadir}/zenmap/locale/pt_BR @@ -173,6 +183,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.134 2008-03-15 00:34:09 qboosh +- ac regeneration fixes, together with workaround for libtool 2.2 +- zenmap R: python-pygtk-gtk, python-sqlite +- added COPYING to doc (important notes there) + Revision 1.133 2008-03-13 12:40:43 kosmo - added missing BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nmap.spec?r1=1.133&r2=1.134&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
