From 161695949d0abb807a27801d7bf18a75ac28ac85 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Dec 13 2018 07:59:48 +0000 Subject: make spec more backward compatible --- diff --git a/kea.spec b/kea.spec index 8be9d28..915af0d 100644 --- a/kea.spec +++ b/kea.spec @@ -5,7 +5,7 @@ Summary: DHCPv4, DHCPv6 and DDNS server from ISC Name: kea Version: 1.5.0 -Release: %{BETAVER}.1%{?dist} +Release: %{BETAVER}.2%{?dist} License: MPLv2.0 and Boost URL: http://kea.isc.org Source0: http://ftp.isc.org/isc/kea/%{version}/kea-%{version}-%{BETAVER}.tar.gz @@ -22,10 +22,17 @@ BuildRequires: gcc-c++ # %%configure --with-openssl BuildRequires: openssl-devel # %%configure --with-dhcp-mysql +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: mariadb-connector-c-devel # TODO: propose upstream fix so this is not needed (no server-side related # headers nor configuration should be needed) BuildRequires: postgresql-server-devel +%else +# %%configure --with-dhcp-mysql +BuildRequires: mariadb-devel +# %%configure --with-dhcp-pgsql +BuildRequires: postgresql-devel +%endif BuildRequires: log4cplus-devel %ifnarch s390 %{mips} BuildRequires: valgrind-devel @@ -122,7 +129,7 @@ make %{?_smp_mflags} #make check %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make DESTDIR=%{buildroot} install %{?_smp_mflags} docdir=%{_pkgdocdir} # Get rid of .la files find %{buildroot} -type f -name "*.la" -delete -print @@ -222,6 +229,9 @@ EOF %{_libdir}/pkgconfig/dns++.pc %changelog +* Tue Dec 11 2018 Pavel Zhukov - 1.5.0-beta2.2%{?dist} +- Do not require -connectors on RHEL + * Tue Dec 4 2018 Pavel Zhukov - 1.5.0-beta2.1%{?dist} - update to beta2