From ad4b9f8a9dc569b4f73245686f8c3f87aa2549c0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Mar 2007 18:30:19 +0000 Subject: [PATCH] - BuildRequire openssl-devel when using evolution-openldap. --- evolution-data-server.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index f4e519a..e7dcb54 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -125,6 +125,7 @@ BuildRequires: gtk-doc %if %{ldap_support} %if %{static_ldap} BuildRequires: openldap-evolution-devel +BuildRequires: openssl-devel %else BuildRequires: openldap-devel >= 2.0.11 %endif @@ -185,7 +186,7 @@ mkdir -p krb5-fakeprefix/%{_lib} %if %{static_ldap} %define ldap_flags --with-openldap=%{_libdir}/evolution-openldap --with-static-ldap # Set LIBS so that configure will be able to link with static LDAP libraries, -# which depend on Cyrus SASL and OpenSSL. +# which depend on Cyrus SASL and OpenSSL. XXX Is the "else" clause necessary? if pkg-config openssl ; then export LIBS="-lsasl2 `pkg-config --libs openssl`" else @@ -393,6 +394,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Mar 27 2007 Matthew Barnes - 1.10.0-4.fc7 - Link to static evolution-openldap library (RH bug #210126). +- Require openssl-devel when statically linking against openldap. - Add -Wdeclaration-after-statement to strict build settings. * Thu Mar 22 2007 Matthew Barnes - 1.10.0-3.fc7