From 7040650d7b9ca6766e094d0aa89cf00238a6b454 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Sep 05 2015 12:42:44 +0000
Subject: new release 0.99.1 (introduces new subpackage mod_ipv6calc)


---

diff --git a/.gitignore b/.gitignore
index d5df5b2..7724c1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ ipv6calc-0.73.0.tar.gz
 /ipv6calc-0.97.4.tar.gz
 /ipv6calc-0.98.0.tar.gz
 /ipv6calc-0.99.0.tar.gz
+/ipv6calc-0.99.1.tar.gz
diff --git a/ipv6calc.spec b/ipv6calc.spec
index 25ef73c..aa14ffe 100644
--- a/ipv6calc.spec
+++ b/ipv6calc.spec
@@ -1,9 +1,14 @@
 #define headtag .rc4.head.20150221.115120
 
+# shared library support (deselectable)
+%if "%{?_without_shared:0}%{?!_without_shared:1}" == "1"
+%define enable_shared 1
+%endif
+
 Summary:	IPv6 address format change and calculation utility
 Name:		ipv6calc
-Version:	0.99.0%{?headtag}
-Release:	10%{?dist}
+Version:	0.99.1%{?headtag}
+Release:	13%{?dist}
 Group:		Applications/Text
 URL:		http://www.deepspace6.net/projects/%{name}.html
 License:	GPLv2
@@ -12,9 +17,18 @@ BuildRequires:	openssl-devel
 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))
+%if %{enable_shared}
+Provides: 	ipv6calc-libs = %{version}-%{release}}
+%else
+Conflicts: 	ipv6calc-libs
+%endif
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# mod_ipv6calc related
+%{!?_httpd_apxs:    %{expand: %%global _httpd_apxs    %%{_sbindir}/apxs}}
+%{!?_httpd_moddir:  %{expand: %%global _httpd_moddir  %%{_libdir}/httpd/modules}}
+%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
 
 # database support (deselectable)
 %if "%{?_without_ip2location:0}%{?!_without_ip2location:1}" == "1"
@@ -33,8 +47,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define enable_external 1
 %endif
 
-%if "%{?_without_shared:0}%{?!_without_shared:1}" == "1"
-%define enable_shared 1
+%if "%{?_without_mod_ipv6calc:0}%{?!_without_mod_ipv6calc:1}" == "1"
+%define enable_mod_ipv6calc 1
 %endif
 
 
@@ -53,6 +67,9 @@ BuildRequires: db4-devel
 BuildRequires: libdb-devel
 %endif
 
+# RPM license macro detector
+%define rpm_license_extra %(echo "%{_defaultlicensedir}" | grep -q defaultlicensedir && echo 0 || echo 1)
+
 
 %description
 ipv6calc is a small utility which formats and calculates IPv4/IPv6 addresses
@@ -96,6 +113,7 @@ Available rpmbuild rebuild options:
   --without dbip
   --without external
   --without shared
+  --without mod_ipv6calc
 
 
 %package ipv6calcweb
@@ -113,6 +131,33 @@ Check/addjust %{_sysconfdir}/httpd/conf.d/ipv6calcweb.conf
 Default restricts access to localhost
 
 
+%if %{enable_mod_ipv6calc}
+%package mod_ipv6calc
+Summary: 	Apache module for ipv6calc
+Group:		Applications/Internet
+BuildRequires:	httpd-devel psmisc curl
+Requires:	httpd >= 2.4.0
+Requires:	httpd <= 2.4.99999
+Requires:	ipv6calc = %{version}-%{release}
+%if %{enable_shared}
+Requires:	ipv6calc-libs = %{version}-%{release}}
+%endif
+
+
+%description mod_ipv6calc
+mod_ipv6calc contains an Apache module and a default configuration
+file.
+
+Features:
+ - store anonymized IPv4/v6 address in environment variable
+ - store CountryCode of IPv4/v6 address in environment variable
+(environment variables can be used for custom log format)
+
+Check/addjust %{_sysconfdir}/httpd/conf.d/ipv6calc.conf
+By default the module is disabled.
+%endif
+
+
 %prep
 %setup -q
 %configure \
@@ -126,7 +171,8 @@ Default restricts access to localhost
 	--with-dbip-db=%{dbip_db} \
 	%{?enable_external:--enable-external} \
 	--with-external-db=%{external_db} \
-	%{?enable_shared:--enable-shared}
+	%{?enable_shared:--enable-shared} \
+	%{?enable_mod_ipv6calc:--enable-mod_ipv6calc}
 
 
 %build
@@ -141,20 +187,6 @@ make install DESTDIR=%{buildroot}
 ## Install examples and helper files
 install -d -p %{buildroot}%{_docdir}/%{name}-%{version}/
 
-# tools
-install -d %{buildroot}%{_datadir}/%{name}/tools
-cat <<END | while read tool; do install -m 755 tools/$tool %{buildroot}%{_datadir}/%{name}/tools; done
-GeoIP-update.sh
-IP2Location-update.sh
-DBIP-update.sh
-DBIP-generate-db.pl
-ipv6calc-create-registry-list-ipv4.pl
-ipv6calc-create-registry-list-ipv6.pl
-ipv6calc-db-update.sh
-ipv6calc-registries-check-run-create.sh
-ipv6calc-update-registries.sh
-END
-
 ## examples
 install -d %{buildroot}%{_datadir}/%{name}/examples/
 
@@ -200,7 +232,12 @@ rm -rf %{buildroot}
 
 
 %files
-%doc ChangeLog README CREDITS TODO COPYING LICENSE USAGE doc/ipv6calc.{lyx,sgml,html,xml}
+%if %{rpm_license_extra}
+%doc ChangeLog README CREDITS TODO USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html doc/ipv6calc.xml
+%license COPYING LICENSE
+%else
+%doc ChangeLog README CREDITS TODO USAGE doc/ipv6calc.lyx doc/ipv6calc.sgml doc/ipv6calc.html doc/ipv6calc.xml COPYING LICENSE
+%endif
 
 %defattr(644,root,root,755)
 
@@ -214,7 +251,7 @@ rm -rf %{buildroot}
 %attr(755,-,-) %{_datadir}/%{name}/tools/*
 
 # shared library
-%{?enable_shared:%attr(755,-,-) %{_libdir}/*}
+%{?enable_shared:%attr(755,-,-) %{_libdir}/libipv6calc*}
 
 # database directory
 %{external_db}
@@ -224,15 +261,40 @@ rm -rf %{buildroot}
 
 
 %files ipv6calcweb
-%defattr(644,root,root,755)
-
+%if %{rpm_license_extra}
 %doc ipv6calcweb/README ipv6calcweb/USAGE
+%license COPYING LICENSE
+%else
+%doc ipv6calcweb/README ipv6calcweb/USAGE COPYING LICENSE
+%endif
+
+%defattr(644,root,root,755)
 
 %attr(555,-,-) %{_localstatedir}/www/cgi-bin/ipv6calcweb.cgi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipv6calcweb.conf
 
 
+%files mod_ipv6calc
+%if %{rpm_license_extra}
+%doc mod_ipv6calc/README.mod_ipv6calc
+%license COPYING LICENSE
+%else
+%doc mod_ipv6calc/README.mod_ipv6calc COPYING LICENSE
+%endif
+
+%defattr(644,root,root,755)
+
+%config(noreplace) %{_httpd_confdir}/ipv6calc.conf
+%attr(755,-,-) %{_httpd_moddir}/mod_ipv6calc.so
+
+
 %changelog
+* Sat Sep 05 2015 Peter Bieringer <pb@bieringer.de> - 0.99.1-13
+- new release 0.99.1 (introduces new subpackage mod_ipv6calc)
+
+* Sat Jul 25 2015 Peter Bieringer <pb@bieringer.de>
+- Replace ipv6calc.{lyx,sgml,html,xml} by dedicated file.suffix
+
 * Sat May 02 2015 Peter Bieringer <pb@bieringer.de> - 0.99.0-10
 - new release 0.99.0
 
diff --git a/sources b/sources
index 5c63d86..3446365 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d645f83492b739e8def05dccee53897  ipv6calc-0.99.0.tar.gz
+aa3c0bb7267bc98d50c12f6b5ca4504f  ipv6calc-0.99.1.tar.gz