rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- BuildRequire openssl-devel when using evolution-openldap.

Browse Source
This commit is contained in:
Matthew Barnes 2007-03-27 18:30:19 +00:00
parent d228733a7e
commit ad4b9f8a9d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evolution-data-server.spec
View File

@ -125,6 +125,7 @@ BuildRequires: gtk-doc
%if %{ldap_support} %if %{ldap_support}
%if %{static_ldap} %if %{static_ldap}
BuildRequires: openldap-evolution-devel BuildRequires: openldap-evolution-devel
BuildRequires: openssl-devel
%else %else
BuildRequires: openldap-devel >= 2.0.11 BuildRequires: openldap-devel >= 2.0.11
%endif %endif
@ -185,7 +186,7 @@ mkdir -p krb5-fakeprefix/%{_lib}
%if %{static_ldap} %if %{static_ldap}
%define ldap_flags --with-openldap=%{_libdir}/evolution-openldap --with-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, # 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 if pkg-config openssl ; then
export LIBS="-lsasl2 `pkg-config --libs openssl`" export LIBS="-lsasl2 `pkg-config --libs openssl`"
else else
@ -393,6 +394,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Mar 27 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-4.fc7 * Tue Mar 27 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-4.fc7
- Link to static evolution-openldap library (RH bug #210126). - 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. - Add -Wdeclaration-after-statement to strict build settings.
* Thu Mar 22 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-3.fc7 * Thu Mar 22 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-3.fc7