[ipv6calc] new release 0.97.4

[pbiering]

commit 535aa8a924b7ed64885bfc03787f919d05a0eae2
Author: Peter Bieringer <pb at bieringer.de>
Date:   Sat Aug 2 11:01:38 2014 +0200

    new release 0.97.4

 .gitignore    |    1 +
 ipv6calc.spec |   87 +++++++++++++++++++++++++++++++++++++++++++++++---------
 sources       |    1 +
 3 files changed, 75 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ccac95..c56dcb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ ipv6calc-0.73.0.tar.gz
 /ipv6calc-0.97.1.tar.gz
 /ipv6calc-0.97.2.tar.gz
 /ipv6calc-0.97.3.tar.gz
+/ipv6calc-0.97.4.tar.gz
diff --git a/ipv6calc.spec b/ipv6calc.spec
index 086e6ee..7327477 100644
--- a/ipv6calc.spec
+++ b/ipv6calc.spec
@@ -1,18 +1,20 @@
+#define headtag .head.20140802.084646
+
 Summary:	IPv6 address format change and calculation utility
 Name:		ipv6calc
-Version:	0.97.3
-Release:	3%{?dist}
+Version:	0.97.4%{?headtag}
+Release:	4%{?dist}
 Group:		Applications/Text
 URL:		http://www.deepspace6.net/projects/%{name}.html
 License:	GPLv2
 Source:		ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/%{name}-%{version}.tar.gz
-Requires:	krb5-libs
-BuildRequires:	krb5-devel
+BuildRequires:	openssl-devel
 BuildRequires:	%{_bindir}/iconv
 BuildRequires:	perl(Digest::MD5), perl(Digest::SHA1), perl(URI::Escape)
 BuildRequires:	perl(strict), perl(warnings)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 ipv6calc is a small utility which formats and calculates IPv4/IPv6 addresses
@@ -25,29 +27,39 @@ reverse IPv6 DNS zones (e.g. -a 2001:db8:1234::1/48).
 In addition many format and type conversions are supported, see online help
 and/or given URL for more.
 
-Also this package contains additional executables
- - ipv6loganon: anonymizes Apache webserver logs
- - ipv6logconv: special Apache webserver log converter
+Also this package contains additional programs
+ - ipv6loganon: anonymize Apache web server logs
+ - ipv6logconv: special Apache web server log converter
     (examples included for use with analog)
  - ipv6logstats: create statistics from list of IPv4/IPv6 addresses
-    (examples included for use with gnuplot)
+    (examples included for use with gnu-plot)
+
+
+%package ipv6calcweb
+Summary: IP address information web utility
+Group: Applications/Internet
+Requires: perl(URI) perl(Digest::SHA1) perl(Digest::MD5)
+BuildRequires: perl(URI) perl(Digest::SHA1) perl(Digest::MD5)
+
+%description ipv6calcweb
+ipv6calcweb contains a CGI program and a configuration file for
+displaying information of IP addresses on a web page using ipv6calc.
+
 
 %prep
 %setup -q
-%configure
+%configure --enable-ip2location --with-ip2location-dynamic --with-ip2location-headers-fallback --enable-geoip --with-geoip-dynamic --with-geoip-headers-fallback
 
-iconv -f iso88591 -t utf8 < CREDITS > CREDITS.1 &&
-mv CREDITS.1 CREDITS
 
 %build
 make %{?_smp_mflags} COPTS="$RPM_OPT_FLAGS"
 	
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # Copy examples and helper files together
-mkdir -p redhat/{ipv6logconv,ipv6logstats/examples-{data,gri},ipv6calcweb}
-cp -pf ipv6calcweb/{USAGE,ipv6calcweb.cgi} redhat/ipv6calcweb
+mkdir -p redhat/{ipv6logconv,ipv6logstats/examples-{data,gri}}
 chmod 644 examples/analog/run_analog.sh
 cp -p examples/analog/run_analog.sh redhat/ipv6logconv
 chmod 644 ipv6logstats/{collect_ipv6logstats.pl,example_ipv6logstats.sh}
@@ -56,6 +68,26 @@ cp -pf ipv6logstats/{README,collect_,example_}* redhat/ipv6logstats
 cp -pf ipv6logstats/examples-data/*.txt redhat/ipv6logstats/examples-data
 cp -pf ipv6logstats/examples-gri/*.gri redhat/ipv6logstats/examples-gri
 
+# tools
+install -d %{buildroot}%{_datadir}/%{name}/tools
+for tool in GeoIP-update.sh IP2Location-update.sh; do
+	install -m 755 tools/$tool %{buildroot}%{_datadir}/%{name}/tools
+done
+
+# ipv6calcweb
+mkdir -p redhat-ipv6calcweb
+cp -pf ipv6calcweb/USAGE redhat-ipv6calcweb
+
+install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
+install -d %{buildroot}%{_localstatedir}/www/cgi-bin
+
+install -m 644 ipv6calcweb/ipv6calcweb.conf %{buildroot}%{_sysconfdir}/httpd/conf.d
+install -m 555 ipv6calcweb/ipv6calcweb.cgi  %{buildroot}%{_localstatedir}/www/cgi-bin
+
+
+%clean
+rm -rf %{buildroot}
+
 %check
 %ifnarch ppc64
 	make test
@@ -68,8 +100,35 @@ cp -pf ipv6logstats/examples-gri/*.gri redhat/ipv6logstats/examples-gri
 %{_bindir}/ipv6logstats
 %{_bindir}/ipv6loganon
 %{_mandir}/man8/*
+%{_datadir}/%{name}/tools/*
+
+
+%files ipv6calcweb
+%defattr(-,root,root)
+
+%doc redhat-ipv6calcweb/*
+%{_localstatedir}/www/cgi-bin/ipv6calcweb.cgi
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/ipv6calcweb.conf
 
 %changelog
+* Sat Aug 02 2014 Peter Bieringer <pb at bieringer.de> - 0.97.3-4
+- new release 0.97.4
+
+* Thu Jul 31 2014 Peter Bieringer <pb at bieringer.de>
+- include also tools into main package
+- remove UTF-8 conversion, fixed in upstream now
+
+* Tue Jul 29 2014 Peter Bieringer <pb at bieringer.de>
+- introduce subpackage ipv6calcweb (align with upstream)
+- enable fallback option for IP2Location
+- build with dynamic load of GeoIP and IP2Location support
+
+* Thu Jul 17 2014 Peter Bieringer <pb at bieringer.de>
+- replace DESTDIR=$RPM_BUILD_ROOT with macro, define BuildRoot
+
+* Wed Jul 16 2014 Peter Bieringer <pb at bieringer.de>
+- change requirements from krb5-libs/devel to openssl(-libs)/-devel
+
 * Tue Jul 15 2014 Peter Bieringer <pb at bieringer.de> - 0.97.3-3
 - align package description with upstream
 
diff --git a/sources b/sources
index 9b69a03..0577f9b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 1fc9c1a14802638f21e59408faa721a6  ipv6calc-0.97.3.tar.gz
+a7414ca72f66eb6d515b58c687705d55  ipv6calc-0.97.4.tar.gz