diff --git a/evolution-data-server.spec b/evolution-data-server.spec index c43ef92..720228b 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -18,58 +18,64 @@ %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 +### Abstract ### + Name: evolution-data-server Version: 1.7.4 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries +Summary: Backend data server for Evolution +URL: http://www.gnome.org/projects/evolution/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: %{name}-%{version}.tar.bz2 -#Patch1: evolution-data-server-1.0.2-fix-64-bit-build.patch -#Patch2: fix_contact_leaks.patch -Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch -#Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch -#Patch5: evolution-data-server-1.3.5-nspr_fix.patch - -# Patch for part of bug #141283 not in upstream tarball (in Ximian bugzilla as 70267) -#Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch -Patch98: evolution-1.4.4-ldap-x86_64-hack.patch -Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch -Patch102: evolution-data-server-1.3.8-fix-implicit-function-declarations +### Patches ### -# Fixed upstream (Bug #336035) -#Patch103: evolution-data-server-1.2.0-validatehelo.patch +Patch10: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch +Patch11: evolution-1.4.4-ldap-x86_64-hack.patch +Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch +Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations # Leak fixes by Mark G. Adams -Patch200: gb-309079-attach-48376.patch -Patch201: gb-309079-attach-48377.patch +Patch14: gb-309079-attach-48376.patch +Patch15: gb-309079-attach-48377.patch -Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch +Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch -BuildRoot: %{_tmppath}/%{name}-root -Requires: libsoup >= %{soup_version} +# Gnome.org bug #344693 +Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch + +### Dependencies ### + +Requires: GConf2 Requires: ORBit2 >= %{orbit2_version} -Requires: libbonobo >= %{libbonobo_version} -Requires: libgnomeui +Requires: db4 Requires: gnome-vfs2 -Requires: GConf2 +Requires: libbonobo >= %{libbonobo_version} Requires: libglade2 +Requires: libgnomeui +Requires: libsoup >= %{soup_version} + +### Build Dependencies ### + +BuildRequires: GConf2-devel +BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: bison +BuildRequires: db4-devel BuildRequires: flex BuildRequires: gettext -BuildRequires: intltool -BuildRequires: libtool BuildRequires: glib2-devel BuildRequires: gnome-vfs2-devel -BuildRequires: GConf2-devel -BuildRequires: libsoup-devel >= %{soup_version} -BuildRequires: ORBit2-devel >= %{orbit2_version} +BuildRequires: gnutls-devel +BuildRequires: intltool BuildRequires: libbonobo-devel >= %{libbonobo_version} +BuildRequires: libglade2-devel BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel -BuildRequires: libglade2-devel -BuildRequires: gnutls-devel +BuildRequires: libsoup-devel >= %{soup_version} +BuildRequires: libtool + %if %{use_nss} BuildRequires: nspr-devel BuildRequires: nss-devel @@ -96,9 +102,11 @@ BuildRequires: krb5-devel %endif %description -The evolution-data-server package provides a unified backend for programs that work with contacts, tasks, and calendar information. +The evolution-data-server package provides a unified backend for programs +that work with contacts, tasks, and calendar information. -It was originally developed for Evolution (hence the name), but is now used by other packages. +It was originally developed for Evolution (hence the name), but is now used +by other packages. %package devel Summary: Development files for building against evolution-data-server @@ -113,21 +121,14 @@ evolution-data-server. %prep %setup -q -#%patch1 -p1 -b .fix-64-bit-build -#%patch2 -p1 -b .fix_contact_leaks -%patch3 -p1 -b .workaround-cal-backend-leak -#%patch4 -p1 -b .fix-calendar-factory-GType -#%patch5 -p1 -b .fix_nspr - -#%patch6 -p0 -b .calendar-optimisation-XB70267 - -%patch98 -p1 -b .ldaphack -%patch101 -p1 -b .fix_open_calendar_declaration -%patch102 -p1 -b .fix-implicit-function-declarations -#%patch103 -p1 -b .validatehelo -%patch200 -p0 -b .fix-uid-leak -%patch201 -p0 -b .fix-comp-ref-leak -%patch300 -p1 -b .make_imap4_optional +%patch10 -p1 -b .workaround-cal-backend-leak +%patch11 -p1 -b .ldaphack +%patch12 -p1 -b .fix_open_calendar_declaration +%patch13 -p1 -b .fix-implicit-function-declarations +%patch14 -p0 -b .fix-uid-leak +%patch15 -p0 -b .fix-comp-ref-leak +%patch16 -p1 -b .make_imap4_optional +%patch17 -p1 -b .with-libdb-fix mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -202,10 +203,14 @@ intltoolize --force # Rerun autoconf since we patched configure.in: autoconf +# See Ross Burton's blog entry for why we want --with-libdb. +# http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40 + %configure \ - %gtkdoc_flags \ - --enable-file-locking=fcntl --enable-dot-locking=no \ - %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags + %gtkdoc_flags \ + --with-libdb=/usr \ + --enable-file-locking=fcntl --enable-dot-locking=no \ + %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" @@ -322,8 +327,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc - %changelog +* Tue Jul 19 2006 Matthew Barnes - 1.7.4-2 +- Dynamically link to BDB. +- Add patch to make --with-db configure option work. +- Add Requires for db4 and BuildRequires for db4-devel. +- Clean up spec file, renumber patches. + * Wed Jul 12 2006 Matthew Barnes - 1.7.4-1 - Update to 1.7.4 - Remove patch for Gnome.org bug #345965 (fixed upstream).