Do not specify openssl version

This commit is contained in:
Pavel Zhukov 2017-11-02 13:54:37 +01:00
parent 1713070789
commit e0dc7f7942
2 changed files with 22 additions and 2 deletions

13
kea-openssl.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/m4macros/ax_crypto.m4 b/m4macros/ax_crypto.m4
index dd4a81f..04dd2c8 100644
--- a/m4macros/ax_crypto.m4
+++ b/m4macros/ax_crypto.m4
@@ -284,7 +284,7 @@ then
else
CRYPTO_NAME="OpenSSL"
DISABLED_CRYPTO="Botan"
- CRYPTO_PACKAGE="openssl-1.0.2"
+ CRYPTO_PACKAGE="openssl"
AC_DEFINE_UNQUOTED([WITH_OPENSSL], [], [Compile with OpenSSL crypto])
AC_MSG_CHECKING(for OpenSSL library)
# from bind9

View File

@ -10,7 +10,7 @@ Name: kea
%global LVERSION %{version}-%{prever} %global LVERSION %{version}-%{prever}
#%%global VERSION %%{LVERSION} #%%global VERSION %%{LVERSION}
Version: 1.3.0 Version: 1.3.0
Release: 1%{?dist} Release: 3%{?dist}
License: MPLv2.0 and Boost License: MPLv2.0 and Boost
URL: http://kea.isc.org URL: http://kea.isc.org
Source0: http://ftp.isc.org/isc/kea/%{LVERSION}/kea-%{LVERSION}.tar.gz Source0: http://ftp.isc.org/isc/kea/%{LVERSION}/kea-%{LVERSION}.tar.gz
@ -18,12 +18,13 @@ Source0: http://ftp.isc.org/isc/kea/%{LVERSION}/kea-%{LVERSION}.tar.gz
# http://kea.isc.org/ticket/3529 # http://kea.isc.org/ticket/3529
Patch0: kea-systemd.patch Patch0: kea-systemd.patch
Patch1: kea-1.3.0-hooksdir.patch Patch1: kea-1.3.0-hooksdir.patch
Patch2: kea-openssl.patch
# autoreconf # autoreconf
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: boost-devel BuildRequires: boost-devel
# %%configure --with-openssl # %%configure --with-openssl
BuildRequires: openssl-devel BuildRequires: compat-openssl10-devel
# %%configure --with-dhcp-mysql # %%configure --with-dhcp-mysql
BuildRequires: mariadb-connector-c-devel BuildRequires: mariadb-connector-c-devel
# %%configure --with-dhcp-pgsql # %%configure --with-dhcp-pgsql
@ -81,6 +82,8 @@ Summary: Development headers and libraries for Kea DHCP server
Requires: kea-libs%{?_isa} = %{version}-%{release} Requires: kea-libs%{?_isa} = %{version}-%{release}
# to build hooks (#1335900) # to build hooks (#1335900)
Requires: boost-devel Requires: boost-devel
Requires: compat-openssl10-devel
Requires: pkgconfig
%description devel %description devel
Header files and API documentation. Header files and API documentation.
@ -89,6 +92,7 @@ Header files and API documentation.
%setup -q -n kea-%{LVERSION} %setup -q -n kea-%{LVERSION}
%patch0 -p1 -b .systemd %patch0 -p1 -b .systemd
%patch1 -p1 -b .hooksdir %patch1 -p1 -b .hooksdir
%patch2 -p1 -b .openssl
# install leases db in /var/lib/kea/ not /var/kea/ # install leases db in /var/lib/kea/ not /var/kea/
# http://kea.isc.org/ticket/3523 # http://kea.isc.org/ticket/3523
@ -265,6 +269,9 @@ EOF
%{_libdir}/pkgconfig/dns++.pc %{_libdir}/pkgconfig/dns++.pc
%changelog %changelog
* Thu Nov 2 2017 Pavel Zhukov <pzhukov@redhat.com> - 1.3.0-3
- Add openssl-devel requires
* Mon Oct 23 2017 Pavel Zhukov <pzhukov@redhat.com> - 1.2.0-8 * Mon Oct 23 2017 Pavel Zhukov <pzhukov@redhat.com> - 1.2.0-8
- Require openssl102 - Require openssl102