"make build-rpm" is broken, I did the following to make it generate two
RPMs.
Please review and modify as you see fit.


tj

[tjyang@localhost ntopng]$ svn diff Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in (revision 6750)
+++ Makefile.in (working copy)
@@ -105,6 +105,26 @@
 httpdocs/geoip/GeoIPASNumv6.dat:
  cd httpdocs/geoip; wget -nc
http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz;
gunzip -f GeoIPASNumv6.dat.gz

+
+
+
+geodata := dat_files
+geoipgz: mkdat $(geodata)/GeoLiteCity.dat.gz
$(geodata)/GeoLiteCityv6.dat.gz \
+         $(geodata)/GeoIPASNum.dat.gz $(geodata)/GeoIPASNumv6.dat.gz
+mkdat:
+ mkdir -p ~/ntopng/dat_files
+$(geodata)/GeoLiteCity.dat.gz:
+ cd $(geodata); wget -nc
http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+
+$(geodata)/GeoLiteCityv6.dat.gz:
+ cd $(geodata); wget -nc
http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
+
+$(geodata)/GeoIPASNum.dat.gz:
+ cd $(geodata); wget -nc
http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+
+$(geodata)/GeoIPASNumv6.dat.gz:
+ cd $(geodata); wget -nc
http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
+
 maketar:
  rm -rf ntopng-@PACKAGE_VERSION@
  mkdir ntopng-@PACKAGE_VERSION@
@@ -115,12 +135,12 @@
  #
  rm -rf ntopng-data-@PACKAGE_VERSION@
  mkdir -p ntopng-data-@PACKAGE_VERSION
@/usr/local/share/ntopng/httpdocs/geoip/
- cp ~/dat_files/* ntopng-data-@PACKAGE_VERSION
@/usr/local/share/ntopng/httpdocs/geoip/
+ cp ~/ntopng/dat_files/* ntopng-data-@PACKAGE_VERSION
@/usr/local/share/ntopng/httpdocs/geoip/
  gunzip ntopng-data-@PACKAGE_VERSION
@/usr/local/share/ntopng/httpdocs/geoip/*.gz
  tar cvfz ntopng-data-@[email protected] ntopng-data-@PACKAGE_VERSION@


-build-rpm: maketar
+build-rpm: geoipgz maketar
 # Do NOT build package as root (
http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment)
 # mkdir -p $(HOME)/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 # echo '%_topdir %(echo $HOME)/rpmbuild' > ~/.rpmmacros
[tjyang@localhost ntopng]$


-- 
T.J. Yang
_______________________________________________
Ntop-dev mailing list
[email protected]
http://listgateway.unipi.it/mailman/listinfo/ntop-dev

Reply via email to