From 13d4aed3a61ddb35d7f4239d28a1bdda87ba7f50 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Oct 2009 16:02:52 +0000 Subject: [PATCH] - Update to 2.29.1 - Bump eds_base_version to 2.30. - Add dbus-glib build requirement. - Drop Bonobo + ORBit dependency (yay!). - Remove option to use OpenSSL instead of NSS. - Drop eds_api_version definition since it will never change. - Remove patch for GNOME bug #373146 (deviates from upstream). --- .cvsignore | 2 +- ...er-1.10.1-camel-folder-summary-crash.patch | 14 -- evolution-data-server.spec | 152 ++++++++---------- sources | 2 +- 4 files changed, 70 insertions(+), 100 deletions(-) delete mode 100644 evolution-data-server-1.10.1-camel-folder-summary-crash.patch diff --git a/.cvsignore b/.cvsignore index e26ff26..8553bd6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-2.28.0.tar.bz2 +evolution-data-server-2.29.1.tar.bz2 diff --git a/evolution-data-server-1.10.1-camel-folder-summary-crash.patch b/evolution-data-server-1.10.1-camel-folder-summary-crash.patch deleted file mode 100644 index 42411ff..0000000 --- a/evolution-data-server-1.10.1-camel-folder-summary-crash.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- evolution-data-server-1.10.1/camel/camel-folder-summary.c.camel-folder-summary-crash 2007-05-02 12:46:07.000000000 -0400 -+++ evolution-data-server-1.10.1/camel/camel-folder-summary.c 2007-05-02 12:47:34.000000000 -0400 -@@ -2952,7 +2952,10 @@ - camel_message_info_ptr(const CamelMessageInfo *mi, gint id) - { - if (mi->summary) -- return ((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr(mi, id); -+ if (((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr) -+ return ((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr(mi, id); -+ else -+ return info_ptr(mi, id); - else - return info_ptr(mi, id); - } diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 9590d46..fe15319 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,33 +1,30 @@ -%define use_nss 1 %define ldap_support 1 %define static_ldap 1 %define krb5_support 1 %define nntp_support 1 +%define dbus_glib_version 0.6 %define glib2_version 2.16.1 %define gtk2_version 2.14.0 %define gtk_doc_version 1.9 %define intltool_version 0.35.5 -%define libbonobo_version 2.20.3 %define libgweather_version 2.25.4 %define libical_version 0.43 -%define orbit2_version 2.9.8 %define soup_version 2.3.0 %define sqlite_version 3.5 -%define eds_base_version 2.28 -%define eds_api_version 1.2 +%define eds_base_version 2.30 %define use_gnome_keyring 1 %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 +%define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers +%define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions ### Abstract ### Name: evolution-data-server -Version: 2.28.0 +Version: 2.29.1 Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -44,18 +41,15 @@ Obsoletes: evolution-webcal < 2.24.0 # RH bug #215702 / GNOME bug #487988 Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch -# GNOME bug #373146 -Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch - # RH bug #243296 -Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch ### Build Dependencies ### BuildRequires: GConf2-devel -BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: bison BuildRequires: db4-devel +BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} @@ -64,7 +58,6 @@ BuildRequires: gnutls-devel BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: intltool >= %{intltool_version} -BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libglade2-devel BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel @@ -72,14 +65,9 @@ BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libical-devel >= %{libical_version} BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool -BuildRequires: sqlite-devel >= %{sqlite_version} - -%if %{use_nss} BuildRequires: nspr-devel BuildRequires: nss-devel -%else -BuildRequires: openssl-devel -%endif +BuildRequires: sqlite-devel >= %{sqlite_version} %if %{ldap_support} %if %{static_ldap} @@ -109,7 +97,7 @@ Summary: Development files for building against %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-doc = %{version}-%{release} -Requires: libbonobo-devel +Requires: dbus-glib-devel Requires: libgnome-devel Requires: libgweather-devel Requires: libical-devel @@ -131,8 +119,7 @@ This package contains developer documentation for %{name}. %setup -q %patch10 -p1 -b .fix-ldap-query -%patch11 -p1 -b .camel-folder-summary-crash -%patch12 -p1 -b .fix-64bit-acinclude +%patch11 -p1 -b .fix-64bit-acinclude mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -170,23 +157,17 @@ fi %define nntp_flags --enable-nntp=no %endif -%if %{use_nss} %define ssl_flags --enable-nss=yes --enable-smime=yes -%else -%define ssl_flags --enable-openssl=yes -%endif -%if %{use_nss} if ! pkg-config --exists nss; then echo "Unable to find suitable version of nss to use!" exit 1 fi -%endif %if %{use_gnome_keyring} %define keyring_flags --enable-gnome-keyring %else -%define keyring flags --disable-gnome-keyring +%define keyring_flags --disable-gnome-keyring %endif %if %{support_imap4_provider} @@ -197,12 +178,6 @@ fi export CPPFLAGS="-I%{_includedir}/et" export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et" -%if ! %{use_nss} -if pkg-config openssl ; then - CFLAGS="$CFLAGS `pkg-config --cflags openssl`" - LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" -fi -%endif # Regenerate configure to pick up configure.in and acinclude.m4 changes. aclocal -I m4 @@ -233,8 +208,8 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install # remove libtool archives for importers and the like find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \; rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.a # give the libraries some executable bits find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; @@ -251,28 +226,30 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{eds_base_version}.lang %defattr(-,root,root,-) %doc README COPYING ChangeLog NEWS AUTHORS -%{_libdir}/bonobo/servers/GNOME_Evolution_DataServer_%{eds_api_version}.server -%{_libdir}/libcamel-%{eds_api_version}.so.* -%{_libdir}/libcamel-provider-%{eds_api_version}.so.* -%{_libdir}/libebackend-%{eds_api_version}.so.* -%{_libdir}/libebook-%{eds_api_version}.so.* -%{_libdir}/libecal-%{eds_api_version}.so.* -%{_libdir}/libedata-book-%{eds_api_version}.so.* -%{_libdir}/libedata-cal-%{eds_api_version}.so.* -%{_libdir}/libedataserver-%{eds_api_version}.so.* -%{_libdir}/libedataserverui-%{eds_api_version}.so.* -%{_libdir}/libegroupwise-%{eds_api_version}.so.* -%{_libdir}/libexchange-storage-%{eds_api_version}.so.* -%{_libdir}/libgdata-%{eds_api_version}.so.* -%{_libdir}/libgdata-google-%{eds_api_version}.so.* +%{_libdir}/libcamel-1.2.so.* +%{_libdir}/libcamel-provider-1.2.so.* +%{_libdir}/libebackend-1.2.so.* +%{_libdir}/libebook-1.2.so.* +%{_libdir}/libecal-1.2.so.* +%{_libdir}/libedata-book-1.2.so.* +%{_libdir}/libedata-cal-1.2.so.* +%{_libdir}/libedataserver-1.2.so.* +%{_libdir}/libedataserverui-1.2.so.* +%{_libdir}/libegroupwise-1.2.so.* +%{_libdir}/libgdata-1.2.so.* +%{_libdir}/libgdata-google-1.2.so.* + +%{_libexecdir}/camel-index-control-1.2 +%{_libexecdir}/camel-lock-helper-1.2 +%{_libexecdir}/e-addressbook-factory +%{_libexecdir}/e-calendar-factory -%{_libexecdir}/evolution-data-server-%{eds_base_version} -%{_libexecdir}/camel-index-control-%{eds_api_version} -%{_libexecdir}/camel-lock-helper-%{eds_api_version} %{_datadir}/evolution-data-server-%{eds_base_version} -%{_datadir}/idl/evolution-data-server-%{eds_api_version} +%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service +%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service %{_datadir}/pixmaps/evolution-data-server -%dir %{_libdir}/evolution-data-server-%{eds_api_version} + +%dir %{_libdir}/evolution-data-server-1.2 %dir %{camel_provider_dir} %dir %{eds_extensions_dir} @@ -321,33 +298,31 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_includedir}/evolution-data-server-%{eds_base_version} -%{_libdir}/libcamel-%{eds_api_version}.so -%{_libdir}/libcamel-provider-%{eds_api_version}.so -%{_libdir}/libebackend-%{eds_api_version}.so -%{_libdir}/libebook-%{eds_api_version}.so -%{_libdir}/libecal-%{eds_api_version}.so -%{_libdir}/libedata-book-%{eds_api_version}.so -%{_libdir}/libedata-cal-%{eds_api_version}.so -%{_libdir}/libedataserver-%{eds_api_version}.so -%{_libdir}/libedataserverui-%{eds_api_version}.so -%{_libdir}/libegroupwise-%{eds_api_version}.so -%{_libdir}/libexchange-storage-%{eds_api_version}.so -%{_libdir}/libgdata-%{eds_api_version}.so -%{_libdir}/libgdata-google-%{eds_api_version}.so -%{_libdir}/pkgconfig/camel-%{eds_api_version}.pc -%{_libdir}/pkgconfig/camel-provider-%{eds_api_version}.pc -%{_libdir}/pkgconfig/evolution-data-server-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libebackend-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libebook-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libecal-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libedata-book-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libedata-cal-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libedataserver-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libedataserverui-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libgdata-%{eds_api_version}.pc -%{_libdir}/pkgconfig/libgdata-google-%{eds_api_version}.pc +%{_libdir}/libcamel-1.2.so +%{_libdir}/libcamel-provider-1.2.so +%{_libdir}/libebackend-1.2.so +%{_libdir}/libebook-1.2.so +%{_libdir}/libecal-1.2.so +%{_libdir}/libedata-book-1.2.so +%{_libdir}/libedata-cal-1.2.so +%{_libdir}/libedataserver-1.2.so +%{_libdir}/libedataserverui-1.2.so +%{_libdir}/libegroupwise-1.2.so +%{_libdir}/libgdata-1.2.so +%{_libdir}/libgdata-google-1.2.so +%{_libdir}/pkgconfig/camel-1.2.pc +%{_libdir}/pkgconfig/camel-provider-1.2.pc +%{_libdir}/pkgconfig/evolution-data-server-1.2.pc +%{_libdir}/pkgconfig/libebackend-1.2.pc +%{_libdir}/pkgconfig/libebook-1.2.pc +%{_libdir}/pkgconfig/libecal-1.2.pc +%{_libdir}/pkgconfig/libedata-book-1.2.pc +%{_libdir}/pkgconfig/libedata-cal-1.2.pc +%{_libdir}/pkgconfig/libedataserver-1.2.pc +%{_libdir}/pkgconfig/libedataserverui-1.2.pc +%{_libdir}/pkgconfig/libegroupwise-1.2.pc +%{_libdir}/pkgconfig/libgdata-1.2.pc +%{_libdir}/pkgconfig/libgdata-google-1.2.pc %files doc %defattr(-,root,root,-) @@ -361,6 +336,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Tue Oct 27 2009 Matthew Barnes - 2.29.1-1.fc13 +- Update to 2.29.1 +- Bump eds_base_version to 2.30. +- Add dbus-glib build requirement. +- Drop Bonobo + ORBit dependency (yay!). +- Remove option to use OpenSSL instead of NSS. +- Drop eds_api_version definition since it will never change. +- Remove patch for GNOME bug #373146 (deviates from upstream). + * Mon Sep 21 2009 Milan Crha - 2.28.0-1.fc12 - Update to 2.28.0 diff --git a/sources b/sources index f7e84e6..1973dbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -015a9692904c349034982c69d90b1b37 evolution-data-server-2.28.0.tar.bz2 +e75903b1c938796ad7f54524492fa0d2 evolution-data-server-2.29.1.tar.bz2