Changes - j0ke.net Open Build Service

Changes of Revision 53

[-] [+]	Changed	ntop.spec
@@ -85,7 +85,7 @@ # NTOP_AUTOREBUILD=yes ./configure \|\| echo "new autoconf prepared" # now we are ready for the real configure... %if "%(xft-config --prefix)" == "/usr" -CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H" \ +LIBDIR=%{_libdir} CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H" \ ./configure \ --sysconfdir=/etc \ --prefix=/usr \ @@ -98,7 +98,7 @@ --enable-sslv3 \ --enable-i18n %else -CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H -L/usr/X11R6/%_lib -I/usr/X11R6/include" \ +LIBDIR=%{_libdir} CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H -L/usr/X11R6/%_lib -I/usr/X11R6/include" \ ./configure \ --sysconfdir=/etc \ --prefix=/usr \
[-] [+]	Changed	ntop-3.3.9-configure-geoip.patch ^
@@ -1,17 +1,36 @@ --- configure.in.orig 2009-01-11 20:37:48.000000000 +0100 -+++ configure.in 2009-01-11 20:38:25.000000000 +0100 -@@ -1889,6 +1889,14 @@ ++++ 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" -+ 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 +-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 - wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz - tar xvfz GeoIP.tar.gz +@@ -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-configure-geoip.patch.old ^
@@ -0,0 +1,17 @@ +--- configure.in.orig 2009-01-11 20:37:48.000000000 +0100 ++++ configure.in 2009-01-11 20:38:25.000000000 +0100 +@@ -1889,6 +1889,14 @@ + dnl> GeoIP (http://www.maxmind.com/) + if test -f "GeoIP.tar.gz"; then + echo "GeoIP already present on this machine" ++ 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 + else + wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz + tar xvfz GeoIP.tar.gz