Changes - j0ke.net Open Build Service

Changes of Revision 54

[-] [+]	Changed	ntop.spec
@@ -50,7 +50,7 @@ Source21: GeoLiteCity.dat.gz Source22: GeoIPASNum.dat.gz Patch: ntop-%{version}.diff -Patch1: ntop-3.3.9-configure-geoip.patch +Patch1: ntop-3.3.9-geoip.patch Patch2: rrdPlugin.diff Patch4: dotpath-%{version}.diff Url: http://www.ntop.org
[-] [+]	Deleted	ntop-3.3.9-configure-geoip.patch ^
@@ -1,36 +0,0 @@ ---- configure.in.orig 2009-01-11 20:37:48.000000000 +0100 -+++ configure.in 2009-01-11 21:16:15.000000000 +0100 -@@ -1887,20 +1887,6 @@ - fi - - dnl> GeoIP (http://www.maxmind.com/) --if test -f "GeoIP.tar.gz"; then -- echo "GeoIP already present on this machine" --else -- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz -- tar xvfz GeoIP.tar.gz -- GEO_DIR=`find $PWD -type d -name "GeoIP-"` -- cd $GEO_DIR; ./configure; make; cd .. -- # OSX Fix -- GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" -- if test -f $GEO_DYLIB; then -- ln -s $GEO_DYLIB . -- fi --fi -- - if test -f "GeoLiteCity.dat"; then - echo "GeoLiteCity.dat already present" - else -@@ -1916,10 +1902,9 @@ - fi - - --GEO_DIR=`find $PWD -type d -name "GeoIP-"` --GEO_IP="$GEO_DIR/libGeoIP/" -+GEO_IP="/usr/include" - CFLAGS="$CFLAGS -I$GEO_IP" --LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP" -+LDFLAGS="$LDFLAGS -L$LIBDIR -lGeoIP" - - dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) -
[-] [+]	Added	ntop-3.3.9-geoip.patch ^
@@ -0,0 +1,47 @@ +--- configure.in.orig 2009-01-11 20:37:48.000000000 +0100 ++++ configure.in 2009-01-11 21:16:15.000000000 +0100 +@@ -1887,20 +1887,6 @@ + fi + + dnl> GeoIP (http://www.maxmind.com/) +-if test -f "GeoIP.tar.gz"; then +- echo "GeoIP already present on this machine" +-else +- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz +- tar xvfz GeoIP.tar.gz +- GEO_DIR=`find $PWD -type d -name "GeoIP-"` +- cd $GEO_DIR; ./configure; make; cd .. +- # OSX Fix +- GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" +- if test -f $GEO_DYLIB; then +- ln -s $GEO_DYLIB . +- fi +-fi +- + if test -f "GeoLiteCity.dat"; then + echo "GeoLiteCity.dat already present" + else +@@ -1916,10 +1902,9 @@ + fi + + +-GEO_DIR=`find $PWD -type d -name "GeoIP-"` +-GEO_IP="$GEO_DIR/libGeoIP/" ++GEO_IP="/usr/include" + CFLAGS="$CFLAGS -I$GEO_IP" +-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP" ++LDFLAGS="$LDFLAGS -L$LIBDIR -lGeoIP" + + dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) + +--- Makefile.am.orig 2009-01-11 21:25:20.000000000 +0100 ++++ Makefile.am 2009-01-11 21:25:30.000000000 +0100 +@@ -270,8 +270,6 @@ + + install: install-recursive + +- cd @GEO_DIR@; make install +- + @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) + + @echo ""