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

- Link to static evolution-openldap library (RH bug #210126).

Browse Source 
- Add -Wdeclaration-after-statement to strict build settings.
This commit is contained in:
Matthew Barnes 2007-03-27 18:18:03 +00:00
parent 5ee8cca51d
commit d228733a7e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
evolution-data-server.spec
View File

@ -1,6 +1,6 @@
%define use_nss 1 %define use_nss 1
%define ldap_support 1 %define ldap_support 1
%define static_ldap 0 %define static_ldap 1
%define krb5_support 1 %define krb5_support 1
%define nntp_support 1 %define nntp_support 1
@ -26,7 +26,7 @@
Name: evolution-data-server Name: evolution-data-server
Version: 1.10.0 Version: 1.10.0
Release: 3%{?dist} Release: 4%{?dist}
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
@ -184,6 +184,13 @@ 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,
# which depend on Cyrus SASL and OpenSSL.
if pkg-config openssl ; then
export LIBS="-lsasl2 `pkg-config --libs openssl`"
else
export LIBS="-lsasl2 -lssl -lcrypto"
fi
%else %else
%define ldap_flags --with-openldap=yes %define ldap_flags --with-openldap=yes
%endif %endif
@ -223,8 +230,8 @@ fi
%define imap4_flags --enable-imap4=no %define imap4_flags --enable-imap4=no
%endif %endif
CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS export CPPFLAGS="-I%{_includedir}/et"
CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"; export CFLAGS export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
%if ! %{use_nss} %if ! %{use_nss}
if pkg-config openssl ; then if pkg-config openssl ; then
CFLAGS="$CFLAGS `pkg-config --cflags openssl`" CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@ -251,6 +258,7 @@ CFLAGS="$CFLAGS \
-DPANGO_DISABLE_DEPRECATED=1 \ -DPANGO_DISABLE_DEPRECATED=1 \
-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
-DGDK_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \
-Wdeclaration-after-statement \
-Werror-implicit-function-declaration" -Werror-implicit-function-declaration"
%endif %endif
@ -260,7 +268,8 @@ CFLAGS="$CFLAGS \
%configure \ %configure \
%gtkdoc_flags \ %gtkdoc_flags \
--with-libdb=/usr \ --with-libdb=/usr \
--enable-file-locking=fcntl --enable-dot-locking=no \ --enable-file-locking=fcntl \
--enable-dot-locking=no \
%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
export tagname=CC export tagname=CC
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
@ -382,6 +391,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog %changelog
* Tue Mar 27 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-4.fc7
- Link to static evolution-openldap library (RH bug #210126).
- 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
- Stop beeping at me! - Stop beeping at me!