diff --git a/.gitignore b/.gitignore index 26df1c3..8e71cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ ipv6calc-0.73.0.tar.gz /ipv6calc-b32d47bf915d38e08b53904501764452773d62ca.tar.gz /ipv6calc-4.0.0.tar.gz /ipv6calc-4.0.1.tar.gz +/ipv6calc-4.0.2.tar.gz diff --git a/ipv6calc-4.0.1-bz2072402.patch b/ipv6calc-4.0.1-bz2072402.patch deleted file mode 100644 index f41c424..0000000 --- a/ipv6calc-4.0.1-bz2072402.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/mod_ipv6calc/test_mod_ipv6calc.sh b/mod_ipv6calc/test_mod_ipv6calc.sh -index 93b822b..8df55b2 100755 ---- a/mod_ipv6calc/test_mod_ipv6calc.sh -+++ b/mod_ipv6calc/test_mod_ipv6calc.sh -@@ -44,7 +44,7 @@ create_apache_root_and_start() { - done - - echo "INFO : define listen port 8080 in $dir_base/conf/httpd.conf" -- perl -pi -e 's/^Listen/Listen 8080/g' $dir_base/conf/httpd.conf -+ perl -pi -e 's/^Listen.*/Listen 8080/g' $dir_base/conf/httpd.conf - if [ $? -ne 0 ]; then - echo "ERROR : can't define listen port: $dir_base/conf/httpd.conf" - return 1 -@@ -66,7 +66,8 @@ create_apache_root_and_start() { - - perl -pi -e 's/^ServerRoot.*$//g' $dir_base/conf/httpd.conf - -- for file in 00-base.conf 00-mpm.conf; do -+ for file in 00-base.conf 00-mpm.conf 00-systemd.conf; do -+ [ -e /etc/httpd/conf.modules.d/$file ] || continue - cp /etc/httpd/conf.modules.d/$file $dir_base/conf.modules.d/ - done - diff --git a/ipv6calc.spec b/ipv6calc.spec index 001f798..b2d2b24 100644 --- a/ipv6calc.spec +++ b/ipv6calc.spec @@ -15,8 +15,8 @@ Summary: IPv6 address format change and calculation utility Name: ipv6calc -Version: 4.0.1 -Release: 66%{?gittag}%{?dist} +Version: 4.0.2 +Release: 67%{?gittag}%{?dist} URL: http://www.deepspace6.net/projects/%{name}.html License: GPLv2 %if 0%{?gitcommit:1} @@ -43,8 +43,6 @@ Provides: ipv6calc-libs = %{version}-%{release} Conflicts: ipv6calc-libs %endif -Patch0: ipv6calc-4.0.1-bz2072402.patch - # mod_ipv6calc related %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} @@ -346,6 +344,9 @@ fi %changelog +* Sun Dec 04 2022 Peter Bieringer - 4.0.2-67 +- Final release 4.0.2 + * Thu Jul 21 2022 Fedora Release Engineering - 4.0.1-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index f7c5c54..50cf3b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipv6calc-4.0.1.tar.gz) = 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce +SHA512 (ipv6calc-4.0.2.tar.gz) = 821d65460bce191147438696fe431331407380076beaea811b99541ca0833a7602bc399b2ece01b064dff7d6fcb03b11294ab077adf594fb39de43969d00bc24