rpms/evolution-data-server/devel evolution-data-server-1.5.4-make_imap4_optional.patch, NONE, 1.1 evolution-data-server.spec, 1.77, 1.78
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 9 21:56:15 UTC 2006
Author: dmalcolm
Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11111
Modified Files:
evolution-data-server.spec
Added Files:
evolution-data-server-1.5.4-make_imap4_optional.patch
Log Message:
* Mon Jan 9 2006 David Malcolm <dmalcolm at redhat.com> - 1.5.4-3
- added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in
our packages; re-run automake since we have touched various Makefile.am
files; rerun intltoolize to avoid incompatibilities between tarball copy of
intltool-merge.in and intltool.m4 in intltool package (@EXPANDED_LIBDIR@
renamed to @INTLTOOL_LIBDIR@) (#167574)
- explicitly list the camel providers and e-d-s extension files in the spec file
evolution-data-server-1.5.4-make_imap4_optional.patch:
camel/providers/Makefile.am | 6 +++++-
configure.in | 10 ++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
--- NEW FILE evolution-data-server-1.5.4-make_imap4_optional.patch ---
--- evolution-data-server-1.5.4/configure.in.make_imap4_optional 2006-01-09 14:25:43.000000000 -0500
+++ evolution-data-server-1.5.4/configure.in 2006-01-09 14:28:32.000000000 -0500
@@ -807,6 +807,16 @@
dnl **************************************************
dnl New IMAP code support.
dnl **************************************************
+AC_ARG_ENABLE(imap4,
+[ --enable-imap4=[no/yes] Attempt to compile imap4 provider],,enable_imap4=no)
+if test "x$enable_imap4" = "xyes"; then
+ AC_DEFINE(ENABLE_IMAP4,1,[Build imap4 camel provider])
+ msg_imap4=yes
+else
+ msg_imap4=no
+fi
+AM_CONDITIONAL(ENABLE_IMAP4, test x$enable_imap4 = xyes)
+
AC_ARG_ENABLE(imapp,
[ --enable-imapp=[no/yes] Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code],,enable_imapp=no)
if test "x$enable_imapp" = "xyes"; then
--- evolution-data-server-1.5.4/camel/providers/Makefile.am.make_imap4_optional 2006-01-09 14:23:30.000000000 -0500
+++ evolution-data-server-1.5.4/camel/providers/Makefile.am 2006-01-09 14:24:01.000000000 -0500
@@ -1,5 +1,9 @@
## Process this file with automake to produce Makefile.in
+if ENABLE_IMAP4
+IMAP4_DIR=imap4
+endif
+
if ENABLE_NNTP
NNTP_DIR=nntp
endif
@@ -13,6 +17,6 @@
SENDMAIL_DIR=sendmail
endif
-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imap4 $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- evolution-data-server.spec 5 Jan 2006 20:50:40 -0000 1.77
+++ evolution-data-server.spec 9 Jan 2006 21:56:12 -0000 1.78
@@ -17,10 +17,15 @@
%define use_gtk_doc 1
%endif
+%define support_imap4_provider 0
+
+%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
+%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
+
Summary: Backend data server for evolution
Name: evolution-data-server
Version: 1.5.4
-Release: 2
+Release: 3
License: LGPL
Group: System Environment/Libraries
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -42,6 +47,8 @@
Patch200: gb-309079-attach-48376.patch
Patch201: gb-309079-attach-48377.patch
+Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
+
BuildRoot: %{_tmppath}/%{name}-root
Requires: libsoup >= %{soup_version}
Requires: ORBit2 >= %{orbit2_version}
@@ -115,6 +122,7 @@
%patch103 -p1 -b .validatehelo
%patch200 -p0 -b .fix-uid-leak
%patch201 -p0 -b .fix-comp-ref-leak
+%patch300 -p1 -b .make-imap4-optional
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -158,6 +166,12 @@
fi
%endif
+%if %{support_imap4_provider}
+%define imap4_flags --enable-imap4=yes
+%else
+%define imap4_flags --enable-imap4=no
+%endif
+
CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"; export CFLAGS
%if ! %{use_nss}
@@ -173,13 +187,21 @@
%define gtkdoc_flags --enable-gtk-doc=no
%endif
+# Rerun automake since we patched some Makefile.am files:
+aclocal
+autoheader
+automake
+libtoolize
+intltoolize --force
+
# Rerun autoconf since we patched configure.in:
autoconf
+
%configure \
%gtkdoc_flags \
--enable-file-locking=fcntl --enable-dot-locking=no \
- %ldap_flags %krb5_flags %nntp_flags %ssl_flags
+ %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
export tagname=CC
make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
@@ -215,11 +237,49 @@
%{_datadir}/idl/evolution-data-server-%{eds_api_version}
%{_datadir}/pixmaps/evolution-data-server-%{eds_base_version}
%dir %{_libdir}/evolution-data-server-%{eds_api_version}
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions/
-%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.so
-%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.urls
-%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.so
+%dir %{camel_provider_dir}
+%dir %{eds_extensions_dir}
+
+# Camel providers:
+%{camel_provider_dir}/libcamelgroupwise.so
+%{camel_provider_dir}/libcamelgroupwise.urls
+
+%{camel_provider_dir}/libcamelhula.so
+%{camel_provider_dir}/libcamelhula.urls
+
+%{camel_provider_dir}/libcamelimap.so
+%{camel_provider_dir}/libcamelimap.urls
+
+%if %{support_imap4_provider}
+%{camel_provider_dir}/libcamelimap4.so
+%{camel_provider_dir}/libcamelimap4.urls
+%endif
+
+%{camel_provider_dir}/libcamellocal.so
+%{camel_provider_dir}/libcamellocal.urls
+
+%{camel_provider_dir}/libcamelnntp.so
+%{camel_provider_dir}/libcamelnntp.urls
+
+%{camel_provider_dir}/libcamelpop3.so
+%{camel_provider_dir}/libcamelpop3.urls
+
+%{camel_provider_dir}/libcamelsendmail.so
+%{camel_provider_dir}/libcamelsendmail.urls
+
+%{camel_provider_dir}/libcamelsmtp.so
+%{camel_provider_dir}/libcamelsmtp.urls
+
+# e-d-s extensions:
+%{eds_extensions_dir}/libebookbackendfile.so
+%{eds_extensions_dir}/libebookbackendgroupwise.so
+%{eds_extensions_dir}/libebookbackendldap.so
+%{eds_extensions_dir}/libebookbackendvcf.so
+%{eds_extensions_dir}/libecalbackendcontacts.so
+%{eds_extensions_dir}/libecalbackendfile.so
+%{eds_extensions_dir}/libecalbackendgroupwise.so
+%{eds_extensions_dir}/libecalbackendhttp.so
+%{eds_extensions_dir}/libecalbackendweather.so
%files devel
%defattr(-,root,root,-)
@@ -230,6 +290,14 @@
%changelog
+* Mon Jan 9 2006 David Malcolm <dmalcolm at redhat.com> - 1.5.4-3
+- added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in
+ our packages; re-run automake since we have touched various Makefile.am
+ files; rerun intltoolize to avoid incompatibilities between tarball copy of
+ intltool-merge.in and intltool.m4 in intltool package (@EXPANDED_LIBDIR@
+ renamed to @INTLTOOL_LIBDIR@) (#167574)
+- explicitly list the camel providers and e-d-s extension files in the spec file
+
* Thu Jan 5 2006 David Malcolm <dmalcolm at redhat.com> - 1.5.4-2
- added patch from David Woodhouse to validate reverse DNS domain before using
in SMTP greeting (patch 103, #151121)
More information about the fedora-cvs-commits
mailing list