[ipv6calc/f20] new release 0.97.4

Sat Aug 2 14:33:50 UTC 2014

commit c618c2d4c7871b92a041641148e1c538616501bb
Author: Peter Bieringer <pb at bieringer.de>
Date:   Sat Aug 2 16:33:34 2014 +0200

    new release 0.97.4

 ipv6calc.spec |  131 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 111 insertions(+), 20 deletions(-)
---

diff --git a/ipv6calc.spec b/ipv6calc.spec
index 59db6bc..7327477 100644
--- a/ipv6calc.spec
+++ b/ipv6calc.spec
@@ -1,45 +1,65 @@
+#define headtag .head.20140802.084646
+
 Summary:	IPv6 address format change and calculation utility
 Name:		ipv6calc
-Version:	0.94.1
-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))
+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 IPv6 addresses in
-different ways.
+ipv6calc is a small utility which formats and calculates IPv4/IPv6 addresses
+in different ways.
+
+Install this package, if you want to retrieve information about a particular
+IPv4/IPv6/MAC address (-i ADDRESS) or make life easier in adding entries to
+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 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 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.
 
-Install this package, if you want to extend the existing address detection
-on IPv6 initscript setup or make life easier in adding reverse IPv6 zones
-to DNS or using in DNS queries like
- dig -t ANY `ipv6calc -r 3ffe:ffff:100::1/48`
-Many more format conversions are supported, see given URL for more.
 
 %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}
@@ -48,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
@@ -60,8 +100,59 @@ 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
+
+* Mon Jul 14 2014 Peter Bieringer <pb at bieringer.de> - 0.97.3-2
+- new release 0.97.3
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 26 2014 Marcela Mašláňová <mmaslano at redhat.com> - 0.97.2-2
+- new release 0.97.2
+
+* Wed May 21 2014 Marcela Mašláňová <mmaslano at redhat.com> - 0.97.1-1
+- new release 0.97.1
+
+* Mon May 19 2014 Marcela Mašláňová <mmaslano at redhat.com> - 0.97.0-1
+- new release 0.97
+
+* Fri Feb 14 2014 Marcela Mašláňová <mmaslano at redhat.com> - 0.96.0-1
+- new release 0.96
+
+* Mon Dec  2 2013 Marcela Mašláňová <mmaslano at redhat.com> - 0.95.0-1
+- new release #1033041
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
