Hello community, here is the log from the commit of package nmap for openSUSE:Factory checked in at 2015-03-11 09:59:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nmap (Old) and /work/SRC/openSUSE:Factory/.nmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nmap" Changes: -------- --- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2014-08-27 16:53:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2015-03-11 09:59:04.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 20:03:31 UTC 2015 - [email protected] + +- fix build on SLE 12 by removing gpg-offline dependency +- run spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.WKlQgd/_old 2015-03-11 09:59:05.000000000 +0100 +++ /var/tmp/diff_new_pack.WKlQgd/_new 2015-03-11 09:59:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nmap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,43 +16,38 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define with_system_lua 0%{?suse_version} >= 1220 - Name: nmap -BuildRequires: dos2unix -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: gtk2-devel -BuildRequires: libpcap-devel -BuildRequires: openssl-devel -BuildRequires: pcre-devel -BuildRequires: python-devel -BuildRequires: update-desktop-files -%if %with_system_lua -BuildRequires: pkgconfig(lua) >= 5.2 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif -Url: http://nmap.org/ Version: 6.47 Release: 0 Summary: Portscanner License: GPL-2.0+ Group: Productivity/Networking/Diagnostic -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://nmap.org/ Source: http://nmap.org/dist/nmap-%{version}.tar.bz2 Source1: https://svn.nmap.org/nmap/docs/nmap_gpgkeys.txt#/%{name}.keyring Source2: http://nmap.org/dist/sigs/%{name}-%{version}.tar.bz2.asc -Patch: nmap-6.00-libpcap-filter.diff +Patch0: nmap-6.00-libpcap-filter.diff Patch1: nmap-4.00-noreturn.diff Patch2: nmap-5.61-desktop_files.patch Patch3: nmap-4.75-nostrip.patch Patch5: su-to-zenmap.patch Patch7: nmap-ncat-skip-network-tests.patch +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gtk2-devel +BuildRequires: libpcap-devel +BuildRequires: openssl-devel +BuildRequires: pcre-devel +BuildRequires: python-devel +BuildRequires: update-desktop-files +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with_system_lua} +BuildRequires: pkgconfig(lua) >= 5.2 +%endif %description Nmap is designed to allow system administrators and curious individuals @@ -62,32 +57,18 @@ Find documentation in %{_docdir}/%{name} - - - -Authors: --------- - Fyodor <[email protected]> - %package -n zenmap Summary: A Graphical Front-End for Nmap Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} +Requires: python-gtk Obsoletes: %{name}-gtk < %{version} Provides: %{name}-gtk = %{version}-%{release} %py_requires -Requires: python-gtk %description -n zenmap zenmap is a graphical front-end for the nmap network scanner - - - -Authors: --------- - Fyodor <[email protected]> - %package -n ncat Summary: Network Tool to concatenate and redirect Sockets Group: Productivity/Networking/Diagnostic @@ -108,13 +89,6 @@ applications and thus give you the capability of instantly adding networking support to software that would normally never support it. - - - -Authors: --------- - Fyodor <[email protected]> - %package -n ndiff Summary: Compare Results of Nmap Scans Group: Productivity/Networking/Diagnostic @@ -125,13 +99,6 @@ output files and prints the differences between them: hosts coming up and down, ports becoming open or closed, etc. - - - -Authors: --------- - Fyodor <[email protected]> - %package -n nping Summary: Compare Results of Nmap Scans Group: Productivity/Networking/Diagnostic @@ -139,19 +106,13 @@ %description -n nping Network packet generation tool / ping utility - - -Authors: --------- - Fyodor <[email protected]> %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q -%patch -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch5 -p0 +%patch0 +%patch1 +%patch2 +%patch3 +%patch5 %patch7 -p1 #fix locale dir @@ -167,24 +128,24 @@ mv docs/man-xlate/nmap-zh.1 docs/man-xlate/nmap-zh_CN.1 %build -export CFLAGS="%optflags -DOPENSSL_LOAD_CONF" -export CXXFLAGS="%optflags -DOPENSSL_LOAD_CONF" -%configure --with-libpcap=%{_usr} \ +export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF" +export CXXFLAGS="%{optflags} -DOPENSSL_LOAD_CONF" +%configure --with-libpcap=%{_prefix} \ --with-libdnet=included \ -%if %with_system_lua - --with-liblua=%{_usr} \ +%if %{with_system_lua} + --with-liblua=%{_prefix} \ %else --with-liblua=included \ %endif - --with-libpcre=%{_usr} + --with-libpcre=%{_prefix} -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%__make DESTDIR="%{buildroot}" deskdir="%{_datadir}/gnome/apps/Utilities/" install -%__rm "%{buildroot}%{_bindir}/uninstall_zenmap" -%__install -d "%{buildroot}/usr/share/pixmaps/" -%__ln_s ../zenmap/pixmaps/zenmap.png "%{buildroot}/usr/share/pixmaps/zenmap.png" +make DESTDIR=%{buildroot} deskdir="%{_datadir}/gnome/apps/Utilities/" install +rm "%{buildroot}%{_bindir}/uninstall_zenmap" +install -d "%{buildroot}%{_datadir}/pixmaps/" +ln -s ../zenmap/pixmaps/zenmap.png "%{buildroot}%{_datadir}/pixmaps/zenmap.png" %suse_update_desktop_file zenmap System Network %suse_update_desktop_file zenmap-root System Network %find_lang zenmap @@ -196,15 +157,15 @@ %check pushd ncat -%__make check +make %{?_smp_mflags} check popd pushd libdnet-stripped -%__make check +make %{?_smp_mflags} check popd # retrieve list of compiled in modules -compiled_with=$("${RPM_BUILD_ROOT}%{_bindir}/nmap" -V | %__grep "Compiled with:" ) +compiled_with=$("%{buildroot}%{_bindir}/nmap" -V | grep "Compiled with:" ) # for the following tests, the leading space is relevant # check features built with system libraries [[ $compiled_with == *\ libpcre-* ]] @@ -213,7 +174,7 @@ # check features built with included sources [[ $compiled_with == *\ nmap-libdnet-* ]] # check for lua -%if %with_system_lua +%if %{with_system_lua} [[ $compiled_with == *\ liblua-5.2* ]] %else # lua in nmap tarball identifies itself as "liblua-5.2.1" @@ -221,9 +182,6 @@ %endif # -%clean -%__rm -rf "%{buildroot}" - %files %defattr(-,root,root) %doc COPYING* CHANGELOG HACKING -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
