diff --git a/kea.spec b/kea.spec
index b7f3f4a..26105b4 100644
--- a/kea.spec
+++ b/kea.spec
@@ -50,9 +50,10 @@ Summary:        Dynamic Host Configuration Protocol daemon
 License:        MPL-2.0
 Group:          Productivity/Networking/Boot/Servers
 URL:            https://kea.isc.org/
+
 #Git-Clone:	git://github.com/isc-projects/kea
-Source:         http://ftp.isc.org/isc/kea/%version/kea-%version.tar.gz
-Source2:        http://ftp.isc.org/isc/kea/%version/kea-%version.tar.gz.asc
+Source:         https://ftp.isc.org/isc/kea/%version/kea-%version.tar.gz
+Source2:        https://ftp.isc.org/isc/kea/%version/kea-%version.tar.gz.asc
 # https://www.isc.org/downloads/software-support-policy/openpgp-key/
 Source3:        kea.keyring
 BuildRequires:  autoconf >= 2.59
@@ -101,36 +102,36 @@ Group:          System/Libraries
 A standard set of external libraries used to provide additional
 functionality for Kea DHCP server
 
-%package -n libkea-asiodns%{asiodns_sover}
+%package -n libkea-asiodns%asiodns_sover
 Summary:        Kea DHCP server asiolink abstraction layer library
 Group:          System/Libraries
 
-%description -n libkea-asiodns%{asiodns_sover}
+%description -n libkea-asiodns%asiodns_sover
 The asiodns library provides an abstraction layer between BIND10/Kea
 modules and the asiolink library.
 
-%package -n libkea-asiolink%{asiolink_sover}
+%package -n libkea-asiolink%asiolink_sover
 Summary:        Kea DHCP server socket I/O abstraction layer library
 Group:          System/Libraries
 
-%description -n libkea-asiolink%{asiolink_sover}
+%description -n libkea-asiolink%asiolink_sover
 The asiolink library provides an abstraction layer between BIND10/Kea
 modules and the socket I/O subsystem Kea is using (currently,
 boost::asio).
 
-%package -n libkea-cc%{cc_sover}
+%package -n libkea-cc%cc_sover
 Summary:        Kea DHCP server command channel library
 Group:          System/Libraries
 
-%description -n libkea-cc%{cc_sover}
+%description -n libkea-cc%cc_sover
 libkea-cc is used for the control channel protocol between keactrl
 and the server.
 
-%package -n libkea-cfgclient%{cfgclient_sover}
+%package -n libkea-cfgclient%cfgclient_sover
 Summary:        Kea DHCP server configuration client library
 Group:          System/Libraries
 
-%description -n libkea-cfgclient%{cfgclient_sover}
+%description -n libkea-cfgclient%cfgclient_sover
 The Kea DHCP server can be managed at runtime via the Control
 Channel. The CC allows an external entity (e.g. a tool run by a
 sysadmin or a script) to issue commands to the server which can
@@ -141,26 +142,26 @@ manipulation, and shutdown.
 Communication over the Control Channel is conducted using JSON
 structures.
 
-%package -n libkea-cryptolink%{cryptolink_sover}
+%package -n libkea-cryptolink%cryptolink_sover
 Summary:        Kea DHCP server crypto abstraction layer library
 Group:          System/Libraries
 
-%description -n libkea-cryptolink%{cryptolink_sover}
+%description -n libkea-cryptolink%cryptolink_sover
 The Kea cryptolink library is an abstraction layer for crypto
 library backends (such as Botan, OpenSSL).
 
-%package -n libkea-database%{database_sover}
+%package -n libkea-database%database_sover
 Summary:        Kea database abstraction library
 Group:          System/Library
 
-%description -n libkea-database%{database_sover}
+%description -n libkea-database%database_sover
 Kea's database abstraction library.
 
-%package -n libkea-dhcp++%{dhcppp_sover}
+%package -n libkea-dhcp++%dhcppp_sover
 Summary:        Kea DHCP library
 Group:          System/Libraries
 
-%description -n libkea-dhcp++%{dhcppp_sover}
+%description -n libkea-dhcp++%dhcppp_sover
 libdhcp++ is an all-purpose DHCP-manipulation library, written in
 C++. It offers packet parsing and assembly, DHCPv4 and DHCPv6 options
 parsing and assembly, interface detection, and socket operations It
@@ -168,53 +169,53 @@ can be used by server, client, relay, performance tools and other
 DHCP-related tools. For a server-specific library, see
 libkea-dhcpsrv.
 
-%package -n libkea-dhcp_ddns%{dhcp_ddns_sover}
+%package -n libkea-dhcp_ddns%dhcp_ddns_sover
 Summary:        Kea DHCP Dynamic DNS library
 Group:          System/Libraries
 
-%description -n libkea-dhcp_ddns%{dhcp_ddns_sover}
+%description -n libkea-dhcp_ddns%dhcp_ddns_sover
 This is a library of classes for sending and receiving requests used
 by ISC's DHCP-DDNS (aka D2) service to carry out DHCP-driven DNS
 updates.
 
-%package -n libkea-dhcpsrv%{dhcpsrv_sover}
+%package -n libkea-dhcpsrv%dhcpsrv_sover
 Summary:        Kea DHCP server component library
 Group:          System/Libraries
 
-%description -n libkea-dhcpsrv%{dhcpsrv_sover}
+%description -n libkea-dhcpsrv%dhcpsrv_sover
 This library contains code used for the DHCPv4 and DHCPv6 servers'
 operations, including the "Lease Manager" that manages information
 about leases and the "Configuration Manager" that stores the servers'
 configuration etc.
 
-%package -n libkea-dns++%{dnspp_sover}
+%package -n libkea-dns++%dnspp_sover
 Summary:        Kea DHCP server component library
 Group:          System/Libraries
 
-%description -n libkea-dns++%{dnspp_sover}
+%description -n libkea-dns++%dnspp_sover
 One of the many libraries the Kea DHCP server is composed of.
 
-%package -n libkea-eval%{eval_sover}
+%package -n libkea-eval%eval_sover
 Summary:        Kea DHCP expression evaluation library
 Group:          System/Libraries
 
-%description -n libkea-eval%{eval_sover}
+%description -n libkea-eval%eval_sover
 The core of the libeval library is a parser that is able to parse an
 expression (e.g. option[123].text == 'APC'). This is currently used
 for client classification.
 
-%package -n libkea-exceptions%{exceptions_sover}
+%package -n libkea-exceptions%exceptions_sover
 Summary:        Kea DHCP server component library
 Group:          System/Libraries
 
-%description -n libkea-exceptions%{exceptions_sover}
+%description -n libkea-exceptions%exceptions_sover
 One of the many libraries the Kea DHCP server is composed of.
 
-%package -n libkea-hooks%{hooks_sover}
+%package -n libkea-hooks%hooks_sover
 Summary:        Kea DHCP server hook library
 Group:          System/Libraries
 
-%description -n libkea-hooks%{hooks_sover}
+%description -n libkea-hooks%hooks_sover
 The hooks framework is a Kea system that simplifies the way that
 users can write code to modify the behavior of Kea. Instead of
 altering the Kea source code, they write functions that are compiled
@@ -225,73 +226,73 @@ processing, the component "calls out" to functions in the library,
 passing to them the data is it currently working on. They can examine
 and modify the data as required.
 
-%package -n libkea-http%{http_sover}
+%package -n libkea-http%http_sover
 Summary:        Kea DHCP http communication library
 Group:          System/Libraries
 
-%description -n libkea-http%{http_sover}
+%description -n libkea-http%http_sover
 This library is used by Control Agent to establish HTTP connections,
 receive messages and send responses over HTTP. This library uses
 boost ASIO for creating TCP connections and asynchronously receive
 and send the data over the sockets.
 
-%package -n libkea-log%{log_sover}
+%package -n libkea-log%log_sover
 Summary:        Kea DHCP logging system library
 Group:          System/Libraries
 
-%description -n libkea-log%{log_sover}
+%description -n libkea-log%log_sover
 This library contains the Kea logging system, which is based on the
 log4J logging system common in Java development, and includes the
 following ideas: a set of severity levels; a hierarchy of logging
 sources; separation of message use from message text.
 
-%package -n libkea-mysql%{mysql_sover}
+%package -n libkea-mysql%mysql_sover
 Summary:        Kea MySQL database library
 Group:          System/Library
 
-%description -n libkea-mysql%{mysql_sover}
+%description -n libkea-mysql%mysql_sover
 Kea's database library for MySQL.
 
-%package -n libkea-pgsql%{pgsql_sover}
+%package -n libkea-pgsql%pgsql_sover
 Summary:        Kea PostgreSQL database library
 Group:          System/Library
 
-%description -n libkea-pgsql%{pgsql_sover}
+%description -n libkea-pgsql%pgsql_sover
 Kea's database library for PostgreSQL.
 
-%package -n libkea-process%{process_sover}
+%package -n libkea-process%process_sover
 Summary:        Kea DHCP process abstraction library
 Group:          System/Libraries
 
-%description -n libkea-process%{process_sover}
+%description -n libkea-process%process_sover
 One of the many libraries the Kea DHCP server is composed of.
 
-%package -n libkea-stats%{stats_sover}
+%package -n libkea-stats%stats_sover
 Summary:        Kea DHCP Statistics Manager library
 Group:          System/Libraries
 
-%description -n libkea-stats%{stats_sover}
+%description -n libkea-stats%stats_sover
 One of the many libraries the Kea DHCP server is composed of.
 
-%package -n libkea-threads%{threads_sover}
+%package -n libkea-threads%threads_sover
 Summary:        Kea DHCP thread abstraction library
 Group:          System/Libraries
 
-%description -n libkea-threads%{threads_sover}
+%description -n libkea-threads%threads_sover
 Kea's C++ wrapper library for pthreads and mutexes.
 
-%package -n libkea-util-io%{util_io_sover}
+%package -n libkea-util-io%util_io_sover
 Summary:        Kea I/O utility function library
 Group:          System/Library
 
-%description -n libkea-util-io%{util_io_sover}
+%description -n libkea-util-io%util_io_sover
 One of the many libraries the Kea DHCP server is composed of.
 
-%package -n libkea-util%{util_sover}
+%package -n libkea-util%util_sover
 Summary:        Kea utility function library
 Group:          System/Library
 
-%description -n libkea-util%{util_sover}
+%description -n libkea-util%util_sover
 One of the many libraries the Kea DHCP server is composed of.
 
 %package -n python3-kea
@@ -301,32 +302,31 @@ Group:          Python
 %description -n python3-kea
 Python3 interface to ISC Kea DHCP server.
 
-
 %package devel
 Summary:        Development files for the Kea DHCP server
 Group:          Development/Libraries/C and C++
-Requires:       libkea-asiodns%{asiodns_sover} = %version
-Requires:       libkea-asiolink%{asiolink_sover} = %version
-Requires:       libkea-cc%{cc_sover} = %version
-Requires:       libkea-cfgclient%{cfgclient_sover} = %version
-Requires:       libkea-cryptolink%{cryptolink_sover} = %version
-Requires:       libkea-database%{database_sover} = %version
-Requires:       libkea-dhcp++%{dhcppp_sover} = %version
-Requires:       libkea-dhcp_ddns%{dhcp_ddns_sover} = %version
-Requires:       libkea-dhcpsrv%{dhcpsrv_sover} = %version
-Requires:       libkea-dns++%{dnspp_sover} = %version
-Requires:       libkea-eval%{eval_sover} = %version
-Requires:       libkea-exceptions%{exceptions_sover} = %version
-Requires:       libkea-hooks%{hooks_sover} = %version
-Requires:       libkea-http%{http_sover} = %version
-Requires:       libkea-log%{log_sover} = %version
-Requires:       libkea-mysql%{mysql_sover} = %version
-Requires:       libkea-pgsql%{pgsql_sover} = %version
-Requires:       libkea-process%{process_sover} = %version
-Requires:       libkea-stats%{stats_sover} = %version
-Requires:       libkea-threads%{threads_sover} = %version
-Requires:       libkea-util-io%{util_io_sover} = %version
-Requires:       libkea-util%{util_sover} = %version
+Requires:       libkea-asiodns%asiodns_sover = %version
+Requires:       libkea-asiolink%asiolink_sover = %version
+Requires:       libkea-cc%cc_sover = %version
+Requires:       libkea-cfgclient%cfgclient_sover = %version
+Requires:       libkea-cryptolink%cryptolink_sover = %version
+Requires:       libkea-database%database_sover = %version
+Requires:       libkea-dhcp++%dhcppp_sover = %version
+Requires:       libkea-dhcp_ddns%dhcp_ddns_sover = %version
+Requires:       libkea-dhcpsrv%dhcpsrv_sover = %version
+Requires:       libkea-dns++%dnspp_sover = %version
+Requires:       libkea-eval%eval_sover = %version
+Requires:       libkea-exceptions%exceptions_sover = %version
+Requires:       libkea-hooks%hooks_sover = %version
+Requires:       libkea-http%http_sover = %version
+Requires:       libkea-log%log_sover = %version
+Requires:       libkea-mysql%mysql_sover = %version
+Requires:       libkea-pgsql%pgsql_sover = %version
+Requires:       libkea-process%process_sover = %version
+Requires:       libkea-stats%stats_sover = %version
+Requires:       libkea-threads%threads_sover = %version
+Requires:       libkea-util-io%util_io_sover = %version
+Requires:       libkea-util%util_sover = %version
 # Bundy DHCP and Kea share the same origin, so conflict
 Conflicts:      otheproviders(pkgconfig(dns++))
 
@@ -334,12 +334,12 @@ Conflicts:      otheproviders(pkgconfig(dns++))
 Development files for the Kea DHCP server
 
 %prep
-%setup -q -n kea-1.6.0-beta2
+%autosetup -p1 -n kea-1.6.0-beta2
 
 %build
-export FREERADIUS_INCLUDE=/usr/include/freeradius
-export FREERADIUS_LIB=
-export FREERADIUS_DICTIONARY=
+export FREERADIUS_INCLUDE="%_includedir/freeradius"
+export FREERADIUS_LIB=""
+export FREERADIUS_DICTIONARY=""
 autoreconf -fi
 %configure \
 	--disable-rpath \
@@ -356,9 +356,9 @@ autoreconf -fi
 make %{?_smp_mflags}
 
 %install
-b=%buildroot
+b="%buildroot"
 %make_install
-find %buildroot -type f -name "*.la" -delete -print
+find "%buildroot" -type f -name "*.la" -delete -print
 mkdir -p "$b/%_unitdir" "$b/%_prefix/lib/tmpfiles.d"
 ls -l "$b/%_unitdir/" "$b/%_prefix/lib/tmpfiles.d/" || :
 cat <<-EOF >"$b/%_unitdir/kea.service"
@@ -388,8 +388,8 @@ mkdir -p "$b%_localstatedir/log/kea"
 ln -s "%_sbindir/service" "%buildroot/%_sbindir/rc%name"
 
 # Remove unnecessary files
-find %buildroot%_libdir -name "*.so.*" -type l -delete
-rm -rf %buildroot%python3_sitelib/kea/__pycache__
+find "%buildroot/%_libdir" -name "*.so.*" -type l -delete
+rm -Rf "%buildroot/%python3_sitelib/kea/__pycache__"
 
 %pre
 getent group keadhcp >/dev/null || groupadd -r keadhcp
@@ -408,50 +408,50 @@ systemd-tmpfiles --create kea.conf || :
 %postun
 %service_del_postun kea.service
 
-%post   -n libkea-asiodns%{asiodns_sover} -p /sbin/ldconfig
-%postun -n libkea-asiodns%{asiodns_sover} -p /sbin/ldconfig
-%post   -n libkea-asiolink%{asiolink_sover} -p /sbin/ldconfig
-%postun -n libkea-asiolink%{asiolink_sover} -p /sbin/ldconfig
-%post   -n libkea-cc%{cc_sover} -p /sbin/ldconfig
-%postun -n libkea-cc%{cc_sover} -p /sbin/ldconfig
-%post   -n libkea-cfgclient%{cfgclient_sover} -p /sbin/ldconfig
-%postun -n libkea-cfgclient%{cfgclient_sover} -p /sbin/ldconfig
-%post   -n libkea-cryptolink%{cryptolink_sover} -p /sbin/ldconfig
-%postun -n libkea-cryptolink%{cryptolink_sover} -p /sbin/ldconfig
-%post   -n libkea-database%{database_sover} -p /sbin/ldconfig
-%postun -n libkea-database%{database_sover} -p /sbin/ldconfig
-%post   -n libkea-dhcp++%{dhcppp_sover} -p /sbin/ldconfig
-%postun -n libkea-dhcp++%{dhcppp_sover} -p /sbin/ldconfig
-%post   -n libkea-dhcp_ddns%{dhcp_ddns_sover} -p /sbin/ldconfig
-%postun -n libkea-dhcp_ddns%{dhcp_ddns_sover} -p /sbin/ldconfig
-%post   -n libkea-dhcpsrv%{dhcpsrv_sover} -p /sbin/ldconfig
-%postun -n libkea-dhcpsrv%{dhcpsrv_sover} -p /sbin/ldconfig
-%post   -n libkea-dns++%{dnspp_sover} -p /sbin/ldconfig
-%postun -n libkea-dns++%{dnspp_sover} -p /sbin/ldconfig
-%post   -n libkea-eval%{eval_sover} -p /sbin/ldconfig
-%postun -n libkea-eval%{eval_sover} -p /sbin/ldconfig
-%post   -n libkea-exceptions%{exceptions_sover} -p /sbin/ldconfig
-%postun -n libkea-exceptions%{exceptions_sover} -p /sbin/ldconfig
-%post   -n libkea-hooks%{hooks_sover} -p /sbin/ldconfig
-%postun -n libkea-hooks%{hooks_sover} -p /sbin/ldconfig
-%post   -n libkea-http%{http_sover} -p /sbin/ldconfig
-%postun -n libkea-http%{http_sover} -p /sbin/ldconfig
-%post   -n libkea-log%{log_sover} -p /sbin/ldconfig
-%postun -n libkea-log%{log_sover} -p /sbin/ldconfig
-%post   -n libkea-mysql%{mysql_sover} -p /sbin/ldconfig
-%postun -n libkea-mysql%{mysql_sover} -p /sbin/ldconfig
-%post   -n libkea-pgsql%{pgsql_sover} -p /sbin/ldconfig
-%postun -n libkea-pgsql%{pgsql_sover} -p /sbin/ldconfig
-%post   -n libkea-process%{process_sover} -p /sbin/ldconfig
-%postun -n libkea-process%{process_sover} -p /sbin/ldconfig
-%post   -n libkea-stats%{stats_sover} -p /sbin/ldconfig
-%postun -n libkea-stats%{stats_sover} -p /sbin/ldconfig
-%post   -n libkea-threads%{threads_sover} -p /sbin/ldconfig
-%postun -n libkea-threads%{threads_sover} -p /sbin/ldconfig
-%post   -n libkea-util-io%{util_io_sover} -p /sbin/ldconfig
-%postun -n libkea-util-io%{util_io_sover} -p /sbin/ldconfig
-%post   -n libkea-util%{util_sover} -p /sbin/ldconfig
-%postun -n libkea-util%{util_sover} -p /sbin/ldconfig
+%post   -n libkea-asiodns%asiodns_sover -p /sbin/ldconfig
+%postun -n libkea-asiodns%asiodns_sover -p /sbin/ldconfig
+%post   -n libkea-asiolink%asiolink_sover -p /sbin/ldconfig
+%postun -n libkea-asiolink%asiolink_sover -p /sbin/ldconfig
+%post   -n libkea-cc%cc_sover -p /sbin/ldconfig
+%postun -n libkea-cc%cc_sover -p /sbin/ldconfig
+%post   -n libkea-cfgclient%cfgclient_sover -p /sbin/ldconfig
+%postun -n libkea-cfgclient%cfgclient_sover -p /sbin/ldconfig
+%post   -n libkea-cryptolink%cryptolink_sover -p /sbin/ldconfig
+%postun -n libkea-cryptolink%cryptolink_sover -p /sbin/ldconfig
+%post   -n libkea-database%database_sover -p /sbin/ldconfig
+%postun -n libkea-database%database_sover -p /sbin/ldconfig
+%post   -n libkea-dhcp++%dhcppp_sover -p /sbin/ldconfig
+%postun -n libkea-dhcp++%dhcppp_sover -p /sbin/ldconfig
+%post   -n libkea-dhcp_ddns%dhcp_ddns_sover -p /sbin/ldconfig
+%postun -n libkea-dhcp_ddns%dhcp_ddns_sover -p /sbin/ldconfig
+%post   -n libkea-dhcpsrv%dhcpsrv_sover -p /sbin/ldconfig
+%postun -n libkea-dhcpsrv%dhcpsrv_sover -p /sbin/ldconfig
+%post   -n libkea-dns++%dnspp_sover -p /sbin/ldconfig
+%postun -n libkea-dns++%dnspp_sover -p /sbin/ldconfig
+%post   -n libkea-eval%eval_sover -p /sbin/ldconfig
+%postun -n libkea-eval%eval_sover -p /sbin/ldconfig
+%post   -n libkea-exceptions%exceptions_sover -p /sbin/ldconfig
+%postun -n libkea-exceptions%exceptions_sover -p /sbin/ldconfig
+%post   -n libkea-hooks%hooks_sover -p /sbin/ldconfig
+%postun -n libkea-hooks%hooks_sover -p /sbin/ldconfig
+%post   -n libkea-http%http_sover -p /sbin/ldconfig
+%postun -n libkea-http%http_sover -p /sbin/ldconfig
+%post   -n libkea-log%log_sover -p /sbin/ldconfig
+%postun -n libkea-log%log_sover -p /sbin/ldconfig
+%post   -n libkea-mysql%mysql_sover -p /sbin/ldconfig
+%postun -n libkea-mysql%mysql_sover -p /sbin/ldconfig
+%post   -n libkea-pgsql%pgsql_sover -p /sbin/ldconfig
+%postun -n libkea-pgsql%pgsql_sover -p /sbin/ldconfig
+%post   -n libkea-process%process_sover -p /sbin/ldconfig
+%postun -n libkea-process%process_sover -p /sbin/ldconfig
+%post   -n libkea-stats%stats_sover -p /sbin/ldconfig
+%postun -n libkea-stats%stats_sover -p /sbin/ldconfig
+%post   -n libkea-threads%threads_sover -p /sbin/ldconfig
+%postun -n libkea-threads%threads_sover -p /sbin/ldconfig
+%post   -n libkea-util-io%util_io_sover -p /sbin/ldconfig
+%postun -n libkea-util-io%util_io_sover -p /sbin/ldconfig
+%post   -n libkea-util%util_sover -p /sbin/ldconfig
+%postun -n libkea-util%util_sover -p /sbin/ldconfig
 
 %files
 %dir %_sysconfdir/kea
@@ -465,85 +465,79 @@ systemd-tmpfiles --create kea.conf || :
 %_unitdir/*.service
 %_prefix/lib/tmpfiles.d/
 %attr(0775,keadhcp,keadhcp) %_localstatedir/log/kea/
-# %ghost %dir %_rundir/%name
 
 %files hooks
 %dir %_libdir/kea
-%dir %_libdir/kea/hooks
-%_libdir/kea/hooks/libdhcp_stat_cmds.so
-%_libdir/kea/hooks/libdhcp_lease_cmds.so
-%_libdir/kea/hooks/libdhcp_ha.so
-%_libdir/kea/hooks/libdhcp_mysql_cb.so
+%_libdir/kea/hooks/
 
-%files -n libkea-asiodns%{asiodns_sover}
-%_libdir/libkea-asiodns.so.%{asiodns_sover}.*
+%files -n libkea-asiodns%asiodns_sover
+%_libdir/libkea-asiodns.so.%asiodns_sover.*
 
-%files -n libkea-asiolink%{asiolink_sover}
-%_libdir/libkea-asiolink.so.%{asiolink_sover}.*
+%files -n libkea-asiolink%asiolink_sover
+%_libdir/libkea-asiolink.so.%asiolink_sover.*
 
-%files -n libkea-cc%{cc_sover}
-%_libdir/libkea-cc.so.%{cc_sover}.*
+%files -n libkea-cc%cc_sover
+%_libdir/libkea-cc.so.%cc_sover.*
 
-%files -n libkea-cfgclient%{cfgclient_sover}
-%_libdir/libkea-cfgclient.so.%{cfgclient_sover}.*
+%files -n libkea-cfgclient%cfgclient_sover
+%_libdir/libkea-cfgclient.so.%cfgclient_sover.*
 
-%files -n libkea-cryptolink%{cryptolink_sover}
-%_libdir/libkea-cryptolink.so.%{cryptolink_sover}.*
+%files -n libkea-cryptolink%cryptolink_sover
+%_libdir/libkea-cryptolink.so.%cryptolink_sover.*
 
-%files -n libkea-database%{database_sover}
-%_libdir/libkea-database.so.%{database_sover}.*
+%files -n libkea-database%database_sover
+%_libdir/libkea-database.so.%database_sover.*
 
-%files -n libkea-dhcp++%{dhcppp_sover}
-%_libdir/libkea-dhcp++.so.%{dhcppp_sover}.*
+%files -n libkea-dhcp++%dhcppp_sover
+%_libdir/libkea-dhcp++.so.%dhcppp_sover.*
 
-%files -n libkea-dhcp_ddns%{dhcp_ddns_sover}
-%_libdir/libkea-dhcp_ddns.so.%{dhcp_ddns_sover}.*
+%files -n libkea-dhcp_ddns%dhcp_ddns_sover
+%_libdir/libkea-dhcp_ddns.so.%dhcp_ddns_sover.*
 
-%files -n libkea-dhcpsrv%{dhcpsrv_sover}
-%_libdir/libkea-dhcpsrv.so.%{dhcpsrv_sover}.*
+%files -n libkea-dhcpsrv%dhcpsrv_sover
+%_libdir/libkea-dhcpsrv.so.%dhcpsrv_sover.*
 
-%files -n libkea-dns++%{dnspp_sover}
-%_libdir/libkea-dns++.so.%{dnspp_sover}.*
+%files -n libkea-dns++%dnspp_sover
+%_libdir/libkea-dns++.so.%dnspp_sover.*
 
-%files -n libkea-eval%{eval_sover}
-%_libdir/libkea-eval.so.%{eval_sover}.*
+%files -n libkea-eval%eval_sover
+%_libdir/libkea-eval.so.%eval_sover.*
 
-%files -n libkea-exceptions%{exceptions_sover}
-%_libdir/libkea-exceptions.so.%{exceptions_sover}.*
+%files -n libkea-exceptions%exceptions_sover
+%_libdir/libkea-exceptions.so.%exceptions_sover.*
 
-%files -n libkea-hooks%{hooks_sover}
-%_libdir/libkea-hooks.so.%{hooks_sover}.*
+%files -n libkea-hooks%hooks_sover
+%_libdir/libkea-hooks.so.%hooks_sover.*
 
-%files -n libkea-http%{http_sover}
-%_libdir/libkea-http.so.%{http_sover}.*
+%files -n libkea-http%http_sover
+%_libdir/libkea-http.so.%http_sover.*
 
-%files -n libkea-log%{log_sover}
-%_libdir/libkea-log.so.%{log_sover}.*
+%files -n libkea-log%log_sover
+%_libdir/libkea-log.so.%log_sover.*
 
-%files -n libkea-mysql%{mysql_sover}
-%_libdir/libkea-mysql.so.%{mysql_sover}.*
+%files -n libkea-mysql%mysql_sover
+%_libdir/libkea-mysql.so.%mysql_sover.*
 
-%files -n libkea-pgsql%{pgsql_sover}
-%_libdir/libkea-pgsql.so.%{pgsql_sover}.*
+%files -n libkea-pgsql%pgsql_sover
+%_libdir/libkea-pgsql.so.%pgsql_sover.*
 
-%files -n libkea-process%{process_sover}
-%_libdir/libkea-process.so.%{process_sover}.*
+%files -n libkea-process%process_sover
+%_libdir/libkea-process.so.%process_sover.*
 
-%files -n libkea-stats%{stats_sover}
-%_libdir/libkea-stats.so.%{stats_sover}.*
+%files -n libkea-stats%stats_sover
+%_libdir/libkea-stats.so.%stats_sover.*
 
-%files -n libkea-threads%{threads_sover}
-%_libdir/libkea-threads.so.%{threads_sover}.*
+%files -n libkea-threads%threads_sover
+%_libdir/libkea-threads.so.%threads_sover.*
 
-%files -n libkea-util-io%{util_io_sover}
-%_libdir/libkea-util-io.so.%{util_io_sover}.*
+%files -n libkea-util-io%util_io_sover
+%_libdir/libkea-util-io.so.%util_io_sover.*
 
-%files -n libkea-util%{util_sover}
-%_libdir/libkea-util.so.%{util_sover}.*
+%files -n libkea-util%util_sover
+%_libdir/libkea-util.so.%util_sover.*
 
 %files -n python3-kea
-%dir %python3_sitelib/kea
-%python3_sitelib/kea/*.py
+%python3_sitelib/kea/
 
 %files devel
 %_includedir/kea/