From 6be9b247868b397c1047fe79747fe58ef62a9bf5 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Thu, 2 Jul 2015 13:10:22 +0200
Subject: [PATCH] 0.9.2

---
 .gitignore        |  2 ++
 kea-systemd.patch |  4 ++--
 kea.spec          | 34 ++++++++++++++++++++--------------
 sources           |  2 +-
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef0fbc4..dab1a79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /kea-0.9.tar.gz
 /kea-0.9.1-beta.tar.gz
 /kea-0.9.1.tar.gz
+/kea-0.9.2-beta.tar.gz
+/kea-0.9.2.tar.gz
diff --git a/kea-systemd.patch b/kea-systemd.patch
index e29859e..f2bf070 100644
--- a/kea-systemd.patch
+++ b/kea-systemd.patch
@@ -186,8 +186,8 @@ index 43d7bff..82625ca 100644
  echo "Input file: $1"
  echo "Output file: $2"
  
--sed -e "s+\@localstatedir\@+${localstatedir}+g; s+\@prefix@+${prefix}+g; s+\@sysconfdir@+${sysconfdir}+g" $1 > $2
-+sed -e "s+\@localstatedir\@+${localstatedir}+g; s+\@prefix\@+${prefix}+g; s+\@sysconfdir\@+${sysconfdir}+g; s+\@sbindir\@+${sbindir}+g" $1 > $2
+-sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir@@SEP@${sysconfdir}@SEP@g" $1 > $2
++sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix\@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir\@@SEP@${sysconfdir}@SEP@g; s@SEP@\@sbindir\@@SEP@${sbindir}@SEP@g" $1 > $2
 -- 
 2.3.4
 
diff --git a/kea.spec b/kea.spec
index 110c1e3..81d6a15 100644
--- a/kea.spec
+++ b/kea.spec
@@ -7,9 +7,10 @@
 #%%global VERSION %{version}-%{prever}
 %global VERSION %{version}
 
+
 Summary:  DHCPv4, DHCPv6 and DDNS server from ISC
 Name:     kea
-Version:  0.9.1
+Version:  0.9.2
 Release:  1%{?dist}
 License:  ISC and Boost
 URL:      http://kea.isc.org
@@ -35,9 +36,9 @@ BuildRequires: systemd
 # src/lib/testutils/dhcp_test_lib.sh
 BuildRequires: procps-ng
 
-
-# %%configure --enable-gtest
+# %%configure --with-gtest
 BuildRequires: gtest-devel
+
 # in case you ever wanted to use %%configure --enable-generate-docs
 #BuildRequires: elinks asciidoc plantuml
 
@@ -81,16 +82,17 @@ sed -i -e 's|@localstatedir@|@sharedstatedir@|g' src/lib/dhcpsrv/Makefile.am
 autoreconf --verbose --force --install
 
 %configure \
-    --disable-silent-rules \
     --disable-dependency-tracking \
+    --disable-rpath \
+    --disable-silent-rules \
     --disable-static \
+    --enable-debug \
     --enable-systemd \
-    --with-openssl \
     --with-dhcp-mysql \
     --with-dhcp-pgsql \
-    --disable-rpath \
-    --enable-gtest \
-    --enable-debug
+    --with-gtest \
+    --with-log4cplus \
+    --with-openssl
 
 make %{?_smp_mflags}
 
@@ -98,12 +100,11 @@ make %{?_smp_mflags}
 %check
 #make check
 
-
 %install
-make install DESTDIR=%{buildroot}
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 # Get rid of .la files
-rm -f %{buildroot}%{_libdir}/libkea-*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
 # Start empty lease databases
 mkdir -p %{buildroot}%{_sharedstatedir}/kea/
@@ -150,6 +151,7 @@ EOF
 %{_sbindir}/kea-lfc
 %{_sbindir}/keactrl
 %{_sbindir}/perfdhcp
+%{_bindir}/message
 %{_unitdir}/kea-dhcp4.service
 %{_unitdir}/kea-dhcp6.service
 %{_unitdir}/kea-dhcp-ddns.service
@@ -166,9 +168,8 @@ EOF
 %{_datarootdir}/kea/dhcp4.spec
 %{_datarootdir}/kea/dhcp6.spec
 %{_datarootdir}/kea/scripts/admin-utils.sh
-%{_datarootdir}/kea/scripts/mysql/dhcpdb_create.mysql
-%{_datarootdir}/kea/scripts/mysql/upgrade_1.0_to_2.0.sh
-%{_datarootdir}/kea/scripts/pgsql/dhcpdb_create.pgsql
+%{_datarootdir}/kea/scripts/mysql
+%{_datarootdir}/kea/scripts/pgsql
 %dir %{_sharedstatedir}/kea
 %config(noreplace) %{_sharedstatedir}/kea/kea-leases4.csv
 %config(noreplace) %{_sharedstatedir}/kea/kea-leases6.csv
@@ -202,6 +203,7 @@ EOF
 %{_libdir}/libkea-exceptions.so.*
 %{_libdir}/libkea-hooks.so.*
 %{_libdir}/libkea-log.so.*
+%{_libdir}/libkea-stats.so.*
 %{_libdir}/libkea-threads.so.*
 %{_libdir}/libkea-util-io.so.*
 %{_libdir}/libkea-util.so.*
@@ -220,12 +222,16 @@ EOF
 %{_libdir}/libkea-exceptions.so
 %{_libdir}/libkea-hooks.so
 %{_libdir}/libkea-log.so
+%{_libdir}/libkea-stats.so
 %{_libdir}/libkea-threads.so
 %{_libdir}/libkea-util-io.so
 %{_libdir}/libkea-util.so
 %{_libdir}/pkgconfig/dns++.pc
 
 %changelog
+* Tue Jul 28 2015 Jiri Popelka <jpopelka@redhat.com> - 0.9.2-1
+- 0.9.2
+
 * Wed Apr 01 2015 Jiri Popelka <jpopelka@redhat.com> - 0.9.1-1
 - 0.9.1
 
diff --git a/sources b/sources
index cf96978..613d78d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6adc06d92956fdf93875cbd1443da22  kea-0.9.1.tar.gz
+6d5929e284c642a210b4bc8a18f48c54  kea-0.9.2.tar.gz