From 54eae0ad02589cf6b9bbe33903f60bf78f33b115 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Feb 15 2024 06:50:55 +0000
Subject: Final release 4.2.0


Relocate CGI scripts into dedicated directories
Call autoreconf in setup section

---

diff --git a/ipv6calc.spec b/ipv6calc.spec
index acf6b18..92dc641 100644
--- a/ipv6calc.spec
+++ b/ipv6calc.spec
@@ -1,7 +1,12 @@
 ### supports following defines during RPM build:
 #
-## specific git commit on upstream (EXAMPLE)
-# rpmbuild --undefine=_disable_source_fetch -bb -D "gitcommit b32d47bf915d38e08b53904501764452773d62ca" ipv6calc.spec
+### specific git commit on upstream (EXAMPLE)
+## build SRPMS+RPM
+# rpmbuild --undefine=_disable_source_fetch -ba -D "gitcommit b32d47bf915d38e08b53904501764452773d62ca" ipv6calc.spec
+#
+## rebuild SRPMS on a different system using
+# rpmbuild --rebuild -D "gitcommit b32d47bf915d38e08b53904501764452773d62ca" ipv6calc-<VERSION>-<RELEASE>.YYYYMMDDgitSHORTHASH.DIST.src.rpm
+
 
 %if 0%{?gitcommit:1}
 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
@@ -17,8 +22,8 @@
 
 Summary:	IPv6 address format change and calculation utility
 Name:		ipv6calc
-Version:	4.1.0
-Release:	70%{?gittag}%{?dist}
+Version:	4.2.0
+Release:	80%{?gittag}%{?dist}
 URL:		http://www.deepspace6.net/projects/%{name}.html
 License:	GPLv2
 %if 0%{?gitcommit:1}
@@ -77,7 +82,7 @@ Conflicts:	ipv6calc-libs
 
 
 # Berkeley DB selector
-%define require_db4 %(echo "%{dist}" | egrep -q '^\.el(5|6)$' && echo 1 || echo 0)
+%define require_db4 %(echo "%{dist}" | grep -Eq '^\.el(5|6)$' && echo 1 || echo 0)
 %if %{require_db4}
 BuildRequires: db4-devel
 Requires:      db4
@@ -192,6 +197,8 @@ By default the module is disabled.
 %setup -q
 %endif
 
+autoreconf
+
 
 %build
 %configure \
@@ -215,10 +222,10 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 ## Install examples and helper files
-install -d -p %{buildroot}%{_docdir}/%{name}-%{version}/
+install -d -p %{buildroot}%{_docdir}/%{name}-%{version}
 
 ## examples
-install -d %{buildroot}%{_datadir}/%{name}/examples/
+install -d %{buildroot}%{_datadir}/%{name}/examples
 
 # ipv6logconv
 install -d %{buildroot}%{_datadir}/%{name}/examples/ipv6logconv
@@ -248,15 +255,19 @@ install -d %{buildroot}%{_datadir}/%{name}/selinux
 
 # ipv6calcweb
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -d %{buildroot}%{_localstatedir}/www/cgi-bin
+install -d %{buildroot}%{_localstatedir}/www/ipv6calcweb/cgi-bin
 
 install ipv6calcweb/ipv6calcweb.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
-install -m 755 ipv6calcweb/ipv6calcweb.cgi  %{buildroot}%{_localstatedir}/www/cgi-bin/
-install -m 644 ipv6calcweb/ipv6calcweb-databases-in-var.te  %{buildroot}%{_datadir}/%{name}/selinux/
+install -m 755 ipv6calcweb/ipv6calcweb.cgi %{buildroot}%{_localstatedir}/www/ipv6calcweb/cgi-bin/
+install -m 644 ipv6calcweb/ipv6calcweb-databases-in-var.te %{buildroot}%{_datadir}/%{name}/selinux/
 
+%if %{enable_mod_ipv6calc}
 # mod_ipv6calc
-install -d %{buildroot}%{_datadir}/%{name}/examples/mod_ipv6calc
-install -m 755 mod_ipv6calc/ipv6calc.cgi  %{buildroot}%{_datadir}/%{name}/examples/mod_ipv6calc
+install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
+install -d %{buildroot}%{_localstatedir}/www/ipv6calc/cgi-bin
+install mod_ipv6calc/ipv6calc.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
+install -m 755 mod_ipv6calc/ipv6calc.cgi %{buildroot}%{_localstatedir}/www/ipv6calc/cgi-bin/
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -314,16 +325,16 @@ rm -rf %{buildroot}
 
 %defattr(644,root,root,755)
 
-%attr(755,-,-) %{_localstatedir}/www/cgi-bin/ipv6calcweb.cgi
+%attr(755,-,-) %{_localstatedir}/www/ipv6calcweb/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
+%doc mod_ipv6calc/README.md
 %license COPYING LICENSE
 %else
-%doc mod_ipv6calc/README.mod_ipv6calc COPYING LICENSE
+%doc mod_ipv6calc/README.md COPYING LICENSE
 %endif
 
 %defattr(644,root,root,755)
@@ -331,7 +342,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_httpd_confdir}/ipv6calc.conf
 %attr(755,-,-) %{_httpd_moddir}/mod_ipv6calc.so
 
-%attr(755,-,-) %{_datadir}/%{name}/examples/mod_ipv6calc/ipv6calc.cgi
+%attr(755,-,-) %{_localstatedir}/www/ipv6calc/cgi-bin/ipv6calc.cgi
 
 
 %post
@@ -351,6 +362,11 @@ fi
 
 
 %changelog
+* Fri Jan 26 2024 Peter Bieringer <pb@bieringer.de> - 4.2.0-80
+- Final release 4.2.0
+- Relocate CGI scripts into dedicated directories
+- Call autoreconf in setup section
+
 * Tue Jun 13 2023 Peter Bieringer <pb@bieringer.de> - 4.1.0-70
 - Increase build requirement IP2Location 8.6.0 to support new DB-26
 - Final release 4.1.0
diff --git a/sources b/sources
index 4fe1f95..7697277 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipv6calc-4.1.0.tar.gz) = fc1c5146b8ee95ee3e15d56e45a54c6b5fd446d2ad4e82e709bb1acdb929575cdffdea104cb11b494d191acceb61af7764e2134a2b93c2e8e0217179ad491c6d
+SHA512 (ipv6calc-4.2.0.tar.gz) = 6ad04466dcbfed32a767d87097a97fa1ced94d362c9abda2cd66142f3adea0f80edfdbc1ad67821a469e84fef61f363e7a5c6236f7a760a4ed60eaefdc95cece