[ntop] disable autogen check for svn

Sven Lankes slankes at fedoraproject.org
Wed Aug 1 21:16:34 UTC 2012


commit ac7775c936f093b9419d0cbf83d5d125542f0c7e
Author: Sven Lankes <sven at lank.es>
Date:   Wed Aug 1 23:16:30 2012 +0200

    disable autogen check for svn

 ntop-disable-svn-requirement.patch |   19 +++++++++++++++++++
 ntop.spec                          |    7 ++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/ntop-disable-svn-requirement.patch b/ntop-disable-svn-requirement.patch
new file mode 100644
index 0000000..8aaa663
--- /dev/null
+++ b/ntop-disable-svn-requirement.patch
@@ -0,0 +1,19 @@
+--- ntop-5.0/autogen.sh.orig	2012-08-01 23:12:36.375302258 +0200
++++ ntop-5.0/autogen.sh	2012-08-01 23:12:46.909259070 +0200
+@@ -216,16 +216,6 @@
+   exit 1
+ fi
+ 
+-SVN=`find_command 'svn'`
+-($SVN --version) < /dev/null > /dev/null 2>&1 ||
+-{
+-  echo
+-  echo "You must have svn/subversion installed to compile $progname."
+-  echo "Download the appropriate package for your distribution, or get the"
+-  echo "source from http://subversion.tigris.org"
+-  GNU_OR_DIE=0
+-}
+-
+ if test "$GNU_OR_DIE" -eq 0; then
+   exit 1
+ fi
diff --git a/ntop.spec b/ntop.spec
index 6979a0c..d165244 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,7 +1,7 @@
 %define _hardened_build 1
 Name:           ntop
 Version:        5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -22,6 +22,7 @@ Patch1:         ntop-running-user.patch
 Patch2:         ntop-dbfile-default-dir.patch
 Patch3:         ntop-http_c.patch
 Patch4:         ntop-dot-default-path.patch
+Patch5:         ntop-disable-svn-requirement.patch
 BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
 BuildRequires:  net-snmp-devel, lm_sensors-devel, pcre-devel, mysql-devel
@@ -75,6 +76,7 @@ find . \( -name \*\.gz -o -name \*\.c -o -name \*\.h -o -name \*\.pdf \
 %patch2 -p1 -b .dbfile-default-dir
 %patch3 -p1 -b .http_c
 %patch4 -p0 -b .dot-default-path
+%patch5 -p1 -b .svn
 
 %build
 #run ntop own autoconf wrapper
@@ -201,6 +203,9 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Wed Aug 01 2012 Sven Lankes <sven at lank.es> - 5.0-2
+- disable autogen check for svn
+
 * Wed Aug 01 2012 Sven Lankes <sven at lank.es> - 5.0-1
 - new upstream release (closes rhbz #841827)
 - remove unneccessary patches


More information about the scm-commits mailing list