[kea/f21] do not override @localstatedir@ globally

Jiří Popelka jpopelka at fedoraproject.org
Tue Nov 4 12:47:29 UTC 2014


commit b67335b3271cc64e6c49425dd08d609a1d5a5ef7
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Nov 4 12:11:46 2014 +0100

    do not override @localstatedir@ globally
    
    for example src/bin/keactl/kea.conf.in specifies log file as
    @localstatedir@/log/kea.log

 kea.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/kea.spec b/kea.spec
index 6da5afe..de7d4ec 100644
--- a/kea.spec
+++ b/kea.spec
@@ -10,7 +10,7 @@
 Summary:  DHCPv4, DHCPv6 and DDNS server from ISC
 Name:     kea
 Version:  0.9
-Release:  2%{?dist}
+Release:  3%{?dist}
 License:  ISC and Boost
 URL:      http://kea.isc.org
 Source0:  http://ftp.isc.org/isc/kea/%{VERSION}/kea-%{VERSION}.tar.gz
@@ -73,12 +73,14 @@ Header files and API documentation.
 
 %patch0 -p1 -b .systemd
 
+# install leases db in /var/lib/kea/ not /var/kea/
+# http://kea.isc.org/ticket/3523
+sed -i -e 's|@localstatedir@|@sharedstatedir@|g' src/lib/dhcpsrv/Makefile.am
+
 %build
 autoreconf --verbose --force --install
 
-# --localstatedir=%%{_sharedstatedir} - http://kea.isc.org/ticket/3523
 %configure \
-    --localstatedir=%{_sharedstatedir} \
     --disable-silent-rules \
     --disable-static \
     --enable-systemd \
@@ -199,6 +201,9 @@ install -p -m 644 ext/LICENSE_1_0.txt %{buildroot}%{_defaultdocdir}/kea/
 %{_libdir}/pkgconfig/dns++.pc
 
 %changelog
+* Tue Nov 04 2014 Jiri Popelka <jpopelka at redhat.com> - 0.9-3
+- do not override @localstatedir@ globally
+
 * Wed Sep 24 2014 Dan Horák <dan[at]danny.cz> - 0.9-2
 - valgrind available only on selected arches
 


More information about the scm-commits mailing list