diff --git a/.gitignore b/.gitignore index 43e1b31..65aed26 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /kea-1.3.0.tar.gz /kea-1.5.0-beta1.tar.gz /kea-1.5.0-beta2.tar.gz +/kea-1.5.0.tar.gz diff --git a/kea-systemd.patch b/kea-systemd.patch index cf1b9b8..1a188e1 100644 --- a/kea-systemd.patch +++ b/kea-systemd.patch @@ -99,15 +99,6 @@ diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am index 9eb3da9..b556fcc 100644 --- a/src/bin/keactrl/Makefile.am +++ b/src/bin/keactrl/Makefile.am -@@ -50,6 +50,8 @@ kea-ctrl-agent.conf: kea-ctrl-agent.conf.pre - $(top_builddir)/tools/path_replacer.sh \ - $(top_srcdir)/src/bin/keactrl/kea-ctrl-agent.conf.pre $@ - -+INSTALL_TARGETS = install-empty -+ - if INSTALL_CONFIGURATIONS - - # Since Kea 1.3.0 release we have 4 different Kea configuration files @@ -60,6 +62,31 @@ if INSTALL_CONFIGURATIONS # To preserve any user modifications to the old version of the file, # this old file is backed up as keactrl.conf.bak. @@ -154,3 +145,16 @@ index 9eb3da9..b556fcc 100644 +install-data-local: $(INSTALL_TARGETS) + +uninstall-local: $(UNINSTALL_TARGETS) +diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am +index 4d29c4d..7da0912 100644 +--- a/src/bin/keactrl/Makefile.am ++++ b/src/bin/keactrl/Makefile.am +@@ -55,6 +55,8 @@ kea-netconf.conf: kea-netconf.conf.pre + $(top_builddir)/tools/path_replacer.sh \ + $(top_srcdir)/src/bin/keactrl/kea-netconf.conf.pre $@ + ++INSTALL_TARGETS = install-empty ++ + if INSTALL_CONFIGURATIONS + + # Since Kea 1.3.0 release we have 4 different Kea configuration files diff --git a/kea.spec b/kea.spec index 915af0d..13d7868 100644 --- a/kea.spec +++ b/kea.spec @@ -1,14 +1,14 @@ #http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html %global _hardened_build 1 -%define BETAVER beta2 +### %define BETAVER beta2 Summary: DHCPv4, DHCPv6 and DDNS server from ISC Name: kea Version: 1.5.0 -Release: %{BETAVER}.2%{?dist} +Release: 3%{?dist} License: MPLv2.0 and Boost URL: http://kea.isc.org -Source0: http://ftp.isc.org/isc/kea/%{version}/kea-%{version}-%{BETAVER}.tar.gz +Source0: http://ftp.isc.org/isc/kea/%{version}/kea-%{version}.tar.gz # http://kea.isc.org/ticket/3529 Patch0: kea-systemd.patch @@ -93,7 +93,7 @@ Requires: pkgconfig Header files and API documentation. %prep -%setup -q -n kea-%{version}-%{BETAVER} +%setup -q -n kea-%{version} %patch0 -p1 -b .systemd %patch1 -p1 -b .hooksdir %patch2 -p1 -b .openssl @@ -186,12 +186,10 @@ EOF %{_unitdir}/kea-dhcp-ddns.service %dir %{_sysconfdir}/kea/ %config(noreplace) %{_sysconfdir}/kea/kea-ctrl-agent.conf -%config(noreplace) %{_sysconfdir}/kea/keactrl.conf -%config(noreplace) %{_sysconfdir}/kea/kea-dhcp4.conf -%config(noreplace) %{_sysconfdir}/kea/kea-dhcp6.conf -%config(noreplace) %{_sysconfdir}/kea/kea-dhcp-ddns.conf +%config(noreplace) %{_sysconfdir}/kea/kea*.conf %dir %{_datarootdir}/kea/ %{_datarootdir}/kea/scripts +%{_datarootdir}/kea/yang %dir /run/kea/ %{_tmpfilesdir}/kea.conf %dir %{_sharedstatedir}/kea @@ -229,6 +227,9 @@ EOF %{_libdir}/pkgconfig/dns++.pc %changelog +* Sun Dec 16 2018 Pavel Zhukov - 1.5.0-3 +- Update to released version + * Tue Dec 11 2018 Pavel Zhukov - 1.5.0-beta2.2%{?dist} - Do not require -connectors on RHEL diff --git a/sources b/sources index dceb3ea..b30b308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kea-1.5.0-beta2.tar.gz) = c107a7a570d018a05d42bd0d521757d9036c4bdabf2943ac3c96e2f5124ec6f34fe1d60660450a51cba20b24e8fda3915e8c5ee2d3e5e6df4319ba965153b8de +SHA512 (kea-1.5.0.tar.gz) = 6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8