pool/evolution-data-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 45044 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/evolution-data-server based on submit request 45044 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/45044
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=78
This commit is contained in:
OBS User autobuild 2010-08-09 16:20:54 +00:00 committed by Git OBS Bridge
commit 1c4a6d479e
6 changed files with 218 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dice-eds-changes.patch
View File

@ -1,8 +1,8 @@
Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c Index: evolution-data-server-2.31.5/calendar/libecal/e-cal-component.c
=================================================================== ===================================================================
--- evolution-data-server-2.29.3.orig/calendar/libecal/e-cal-component.c --- evolution-data-server-2.31.5.orig/calendar/libecal/e-cal-component.c
+++ evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c +++ evolution-data-server-2.31.5/calendar/libecal/e-cal-component.c
@@ -161,6 +161,8 @@ struct _ECalComponentPrivate { @@ -163,6 +163,8 @@ struct _ECalComponentPrivate {
* object over the wire. * object over the wire.
*/ */
guint need_sequence_inc : 1; guint need_sequence_inc : 1;
@ -11,7 +11,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
}; };
/* Private structure for alarms */ /* Private structure for alarms */
@@ -372,6 +374,9 @@ free_icalcomponent (ECalComponent *comp, @@ -335,6 +337,9 @@ free_icalcomponent (ECalComponent *comp,
/* Free the subcomponents */ /* Free the subcomponents */
g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL); g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL);
@ -19,9 +19,9 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
+ g_slist_free (priv->x_list); + g_slist_free (priv->x_list);
+ priv->x_list = NULL; + priv->x_list = NULL;
/* Clean up */ /* Free the icalcomponent */
@@ -527,6 +532,13 @@ e_cal_component_clone (ECalComponent *co @@ -497,6 +502,13 @@ e_cal_component_clone (ECalComponent *co
return new_comp; return new_comp;
} }
@ -35,7 +35,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
/* Scans an attachment property */ /* Scans an attachment property */
static void static void
scan_attachment (GSList **attachment_list, icalproperty *prop) scan_attachment (GSList **attachment_list, icalproperty *prop)
@@ -789,7 +801,8 @@ scan_property (ECalComponent *comp, ical @@ -759,7 +771,8 @@ scan_property (ECalComponent *comp, ical
case ICAL_LOCATION_PROPERTY : case ICAL_LOCATION_PROPERTY :
priv->location = prop; priv->location = prop;
break; break;
@ -45,7 +45,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
default: default:
break; break;
} }
@@ -945,6 +958,9 @@ scan_icalcomponent (ECalComponent *comp) @@ -915,6 +928,9 @@ scan_icalcomponent (ECalComponent *comp)
g_assert (priv->icalcomp != NULL); g_assert (priv->icalcomp != NULL);
@ -55,7 +55,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
/* Scan properties */ /* Scan properties */
for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY); for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY);
@@ -1043,7 +1059,9 @@ e_cal_component_set_new_vtype (ECalCompo @@ -1013,7 +1029,9 @@ e_cal_component_set_new_vtype (ECalCompo
case E_CAL_COMPONENT_TIMEZONE: case E_CAL_COMPONENT_TIMEZONE:
kind = ICAL_VTIMEZONE_COMPONENT; kind = ICAL_VTIMEZONE_COMPONENT;
break; break;
@ -66,7 +66,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
default: default:
g_assert_not_reached (); g_assert_not_reached ();
kind = ICAL_NO_COMPONENT; kind = ICAL_NO_COMPONENT;
@@ -1061,8 +1079,8 @@ e_cal_component_set_new_vtype (ECalCompo @@ -1031,8 +1049,8 @@ e_cal_component_set_new_vtype (ECalCompo
scan_icalcomponent (comp); scan_icalcomponent (comp);
/* Add missing stuff */ /* Add missing stuff */
@ -77,7 +77,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
} }
/** /**
@@ -1085,6 +1103,7 @@ e_cal_component_set_icalcomponent (ECalC @@ -1055,6 +1073,7 @@ e_cal_component_set_icalcomponent (ECalC
{ {
ECalComponentPrivate *priv; ECalComponentPrivate *priv;
icalcomponent_kind kind; icalcomponent_kind kind;
@ -85,7 +85,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
g_return_val_if_fail (comp != NULL, FALSE); g_return_val_if_fail (comp != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
@@ -1107,13 +1126,17 @@ e_cal_component_set_icalcomponent (ECalC @@ -1077,13 +1096,17 @@ e_cal_component_set_icalcomponent (ECalC
|| kind == ICAL_VTODO_COMPONENT || kind == ICAL_VTODO_COMPONENT
|| kind == ICAL_VJOURNAL_COMPONENT || kind == ICAL_VJOURNAL_COMPONENT
|| kind == ICAL_VFREEBUSY_COMPONENT || kind == ICAL_VFREEBUSY_COMPONENT
@ -105,7 +105,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
return TRUE; return TRUE;
} }
@@ -1152,6 +1175,7 @@ void @@ -1122,6 +1145,7 @@ void
e_cal_component_rescan (ECalComponent *comp) e_cal_component_rescan (ECalComponent *comp)
{ {
ECalComponentPrivate *priv; ECalComponentPrivate *priv;
@ -113,7 +113,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
g_return_if_fail (comp != NULL); g_return_if_fail (comp != NULL);
g_return_if_fail (E_IS_CAL_COMPONENT (comp)); g_return_if_fail (E_IS_CAL_COMPONENT (comp));
@@ -1163,7 +1187,10 @@ e_cal_component_rescan (ECalComponent *c @@ -1133,7 +1157,10 @@ e_cal_component_rescan (ECalComponent *c
/* Rescan */ /* Rescan */
scan_icalcomponent (comp); scan_icalcomponent (comp);
@ -125,7 +125,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
} }
/** /**
@@ -1224,6 +1251,9 @@ e_cal_component_get_vtype (ECalComponent @@ -1194,6 +1221,9 @@ e_cal_component_get_vtype (ECalComponent
case ICAL_VTIMEZONE_COMPONENT: case ICAL_VTIMEZONE_COMPONENT:
return E_CAL_COMPONENT_TIMEZONE; return E_CAL_COMPONENT_TIMEZONE;
@ -135,7 +135,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
default: default:
/* We should have been loaded with a supported type! */ /* We should have been loaded with a supported type! */
g_assert_not_reached (); g_assert_not_reached ();
@@ -2616,6 +2646,27 @@ e_cal_component_set_dtstart (ECalCompone @@ -2586,6 +2616,27 @@ e_cal_component_set_dtstart (ECalCompone
priv->need_sequence_inc = TRUE; priv->need_sequence_inc = TRUE;
} }
@ -163,7 +163,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
/** /**
* e_cal_component_get_due: * e_cal_component_get_due:
* @comp: A calendar component object. * @comp: A calendar component object.
@@ -4060,6 +4111,24 @@ e_cal_component_get_sequence (ECalCompon @@ -4040,6 +4091,24 @@ e_cal_component_get_sequence (ECalCompon
**sequence = icalproperty_get_sequence (priv->sequence); **sequence = icalproperty_get_sequence (priv->sequence);
} }
@ -188,7 +188,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
/** /**
* e_cal_component_set_sequence: * e_cal_component_set_sequence:
* @comp: A calendar component object. * @comp: A calendar component object.
@@ -6038,3 +6107,77 @@ e_cal_component_event_dates_match (ECalC @@ -6018,3 +6087,77 @@ e_cal_component_event_dates_match (ECalC
return retval; return retval;
} }
@ -266,10 +266,10 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
+ +
+ return -1; + return -1;
+} +}
Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h Index: evolution-data-server-2.31.5/calendar/libecal/e-cal-component.h
=================================================================== ===================================================================
--- evolution-data-server-2.29.3.orig/calendar/libecal/e-cal-component.h --- evolution-data-server-2.31.5.orig/calendar/libecal/e-cal-component.h
+++ evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h +++ evolution-data-server-2.31.5/calendar/libecal/e-cal-component.h
@@ -51,7 +51,8 @@ typedef enum { @@ -51,7 +51,8 @@ typedef enum {
E_CAL_COMPONENT_TODO, E_CAL_COMPONENT_TODO,
E_CAL_COMPONENT_JOURNAL, E_CAL_COMPONENT_JOURNAL,

3
evolution-data-server-2.30.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
size 4636784

3
evolution-data-server-2.31.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45b0ab45031ba9d39c68f1d03915ff17a97efa455616eeff65f6a4264619f124
size 4228117

57
evolution-data-server-shared-nss-db.patch
View File

@ -1,57 +0,0 @@
Index: evolution-data-server-2.29.3/camel/camel.c
===================================================================
--- evolution-data-server-2.29.3.orig/camel/camel.c
+++ evolution-data-server-2.29.3/camel/camel.c
@@ -37,6 +37,8 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
+#include <nss-shared-helper.h>
+
#include "camel.h"
#include "camel-certdb.h"
#include "camel-debug.h"
@@ -93,17 +95,21 @@ camel_init (const gchar *configdir, gboo
nss_configdir = g_win32_locale_filename_from_utf8 (configdir);
#endif
- if (!NSS_IsInitialized()) {
- nss_initialized = 1;
+ if (nsshelp_open_db ("evolution", nss_configdir, 0) != SECSuccess) {
+ g_warning ("Opening non-shared cert database");
+
+ if (!NSS_IsInitialized()) {
+ nss_initialized = 1;
- if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
- /* fall back on using volatile dbs? */
- if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
- g_free (nss_configdir);
- g_warning ("Failed to initialize NSS");
- nss_initialized = 0;
- PR_Unlock(nss_initlock);
- return -1;
+ if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
+ /* fall back on using volatile dbs? */
+ if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
+ g_free (nss_configdir);
+ g_warning ("Failed to initialize NSS");
+ nss_initialized = 0;
+ PR_Unlock(nss_initlock);
+ return -1;
+ }
}
}
}
Index: evolution-data-server-2.29.3/configure.ac
===================================================================
--- evolution-data-server-2.29.3.orig/configure.ac
+++ evolution-data-server-2.29.3/configure.ac
@@ -540,6 +540,7 @@ dnl check if pkg-config files exist (whi
done
if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then
+ mozilla_nss="$mozilla_nss nss-shared-helper"
msg_ssl="yes"
if test "x$enable_smime" = "xyes"; then
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])

189
evolution-data-server.changes
View File

@ -1,3 +1,192 @@
-------------------------------------------------------------------
Fri Aug 6 01:28:46 CEST 2010 - vuntz@opensuse.org
- Update to version 2.31.6:
+ Evolution-Data-Server now complies with the XDG Base Directory
Specification. Data is now partitioned into three base
directories controlled by environment variables:
- $XDG_DATA_HOME/evolution
- $XDG_CACHE_HOME/evolution
- $XDG_CONFIG_HOME/evolution
Data which is managed by the various address book and calendar
backends will be migrated from $HOME/.evolution upon starting
the corresponding D-Bus factory service.
+ IMAPX:
- Add connection manager
- server flags can be integers
+ Reset BASE_VERSION to 2.32.
+ libebook.pc.in missing camel-1.2 requirement.
+ Removed folders from connection when operations gets done -
handles when jobs return back without executing
+ Avoid absolute paths in "On This Computer" source groups.
+ Remove deprecated ECalBackend::set_default_timezone
+ EDataCal: Add a getCacheDir() D-Bus method.
+ Fix error handling in CamelLocalFolder::sync()
+ Fix error handling in CamelImapFolder::get_message()
+ ebook & edataserverui: Use _async suffix rather than _ex suffix
+ Replace dbus-glib-1 with gio-2.0 in pkgconfig files.
+ Prefer gio-2.0 when requiring GLib libraries.
+ Fixed uudecode logic
+ Optimized camel_uuencode_step
+ Bug Fixes:
- bgo#608299 - Cut/copy error when selection has trailing comma
- bgo#625351 - Sending through sendmail reports error
- bgo#602287, bgo#612082, bgo#622884, bgo#624029, bgo#624316,
bgo#624325, bgo#624417, bgo#624891, bgo#625039, bgo#625083,
bgo#625282, bgo#625482, bgo#625606
+ Updated translations.
- Drop evolution-data-server-shared-nss-db.patch: upstream fixed it
another way, with the sqlite NSS database. Thanks to Wolfgang
Rosenauer for checking this. Also drop nss-shared-helper-devel
BuildRequires, and gnome-common BuildRequires as well as the call
to gnome-autogen.sh.
- Remove unneeded krb5-devel, libcom_err, libgpg-error-devel,
nss-shared-helper-devel Requires from devel package.
- Remove gconf2-devel, glib2-devel, gnome-vfs2-devel, gtk2-devel,
libglade2-devel, libgnome-keyring-devel, libgweather-devel,
libical-devel, libsoup-devel, libxml2-devel, sqlite3-devel
Requires from devel package: they will be automatically added
with pkgconfig()-like Requires.
- Drop unneeded libglade2-devel BuildRequires.
-------------------------------------------------------------------
Tue Jul 13 08:54:28 UTC 2010 - dimstar@opensuse.org
- Update to version 2.31.5:
+ Lots of IMAPX improvements
+ Make NSS database initialisation more robust, handle errors
better
+ Use text/vcard content type on WebDAV PUT request
+ Migrate from CamelException to GError.
+ Work around sudden disappearance of GdkRegion in GTK+ 2.90.5.
+ Add functions to get Evo/EDS base directories.
+ Improve error handling in CamelStreamBuffer::read().
+ Bug fixes:
- bgo#618938: Crash when reading calendar acknowledgement
message
- bgo#623936: 75 second delay when creating new DAV entries in
Zimbra
- bgo#623919: Error while opening any newly received message
- bgo#623795: URI at the end of text isn't clickable
- bgo#624018, bgo#623204, bgo#621609, bgo#623431, bgo#623430
+ Updated translations.
-------------------------------------------------------------------
Mon Jul 12 16:22:29 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.4:
+ Always enable QRESYNC where it's available.
+ Handle UIDNEXT and MODSEQ/HIGHESTMODSEQ information from server
+ Allow debugging to be enabled with CAMEL_DEBUG environment
variable
+ Permit all characters but dir_sep in imapx folder names.
+ Simplify relationship between full and path names for imapx
+ Queue non-folder specific jobs while waiting for SELECT to
complete
+ Propagate STATUS responses to folders directly from
imapx_untagged()
+ Fix overzealous IDLE handling
+ Handle [CLOSED] status (RFC5162)
+ Cope with unsolicited FETCH having both FLAGS and UID.
+ Support VANISHED response (RFC5162)
+ Extract EXPUNGE handling into imapx_expunge_uid_from_summary()
function.
+ Fix imapx_parse_flags to not just return the first UID
repeatedly, export it.
+ Fix batch fetch to use UID FETCH in
imapx_job_fetch_new_messages_start()
+ Add LITERALPLUS support
+ Encode folder names as literals when sending commands, where
needed
+ Accept unsolicited CAPABILITY report as part of
LOGIN/AUTHENTICATE response
+ Detect CONDSTORE and QRESYNC capabilities
+ Clarify documentation for e_destination_get_address().
+ Check EBook DBus error names without underscores too
+ Build with gtk3 and have backward compatibility
+ Bug fixes:
- bgo#316783 - Broken dragging of email addresses
- bgo#601535 - Categories not translated in menus
- bgo#621842 - use 'UID FETCH' instead of 'FETCH' for
scan_changes
- bgo#206061 - Allow normal, non-vFolder, Trash and Junk folder
- bgo#610919 - Remove superfluous space in flags in APPEND
command
- bgo#615239 - Fix GSSAPI (and other SASL) authentication for
imapx
- bgo#585301 - Use ~/.pki/nssdb for NSS SQL database, not
Evolution directory.
- bgo#585301 - Use correct NSS system database where
appropriate.
- bgo#621262 - Fix fetch of large mails from broken servers
like Exchange
- bgo#621237 - Add imap-over-custom-command support for imapx
- bgo#622392, bgo#622799, bgo#622710, bgo#620815, bgo#622008,
bgo#621851, bgo#621961, bgo#621877, bgo#621740, bgo#621740,
bgo#617723, bgo#610919, bgo#599879, bgo#585353, bgo#550414,
bgo#622350
- Changes from version 2.31.3:
+ Add support for SOCKS proxy support
+ Bug Fixes:
- bgo#617439 - Fix translation of birthday and anniversary
events
- bgo#585301 - Use NSS SQLite database, if available
- bgo#601535 - Fix translation domain for default categories
- bgo##619347, bgo##620522, bgo##617261
- Changes from version 2.31.2:
+ Improve name selector dialog UI
+ Add ORG support to the Google Contacts backend
+ Add NOTE support to the Google Contacts backend
+ Remove Google Calendar backend
+ Various fixes in the webdav addressbook.
+ Bug Fixes:
- bgo#240317 - Allow searching in subscribe dialog
- bgo#304415 - Allow change of signature hash algorithm
- bgo#337479 - Evolution forgets password on any error
- bgo#556061 - EContact/EVCard can re-order phone and email
attributes
- bgo#531912, bgo#566330, bgo#566354, bgo#604650, bgo#612596,
bgo#617168, bgo#617881, bgo#618474, bgo#618578
- Changes from version 2.31.1:
+ Many imapx improvements and fixes.
+ Don't abbreviate public symbols.
+ Clean up the Google Contacts addressbook backend
+ Show deleted mails from trash and fix a crash
+ Drop the "hula" Camel provider.
+ Drop the "imap4" Camel provider.
+ Remove deprecated API from libedataserver.
+ Remove ESourceOptionMenu from libedataserverui.
+ Bug Fixes:
- bgo#615735 - Contacts are not displayed in GW Addressbook.
- bgo#608620 - Use CRLF in signed & encrypted S/MIME messages
- bgo#616821 - From field missing in mail
- bgo#580021 - Port to external libgdata
- bgo#501140 - IMAP provider missing mnemonics
- bgo#562595 - POP3 Delete after X days should depend on Leave
messages
- bnc#507423 - Message list in Inbox doesn't get refreshed
- bgo#611646 - Calendar shows recurring birthdays incorrectly
- bgo#514041 - Add space between categories
- bnc#583791 - User created contact list does not behave
reliably
- bgo#336776 - Learning junk feedback in status bar unclear
- bgo#614388 - Broken Delete after X days behaviour
- bgo#610353 - Search folder with label matches on substring
- bgo#570508 - Google Contacts does not display business phone
- bgo#567000 - [IMAP] Renaming folder generates errors
- bgo#518876 - Does not display recent messages in nntp
- bgo#418502 - Evolution causes gpg stale locks
- bgo#549221 - Deleted E-Mails re-appear in Evolution client
- bnc#549225 - Evlution client does not update status of
messages in the GroupWise Post Office
- bgo#617263, bgo#545505, bgo#616819, bgo#615246, bgo#616318,
bgo#603773, bgo#615776, bgo#608766, bgo#615290, bgo#253510,
bgo#593843, bgo#538793, bgo#325121, bgo#261087, bgo#611247,
bgo#520233, bgo#614056
- Disable evolution-data-server-shared-nss-db.patch, needs rebase.
- Add libgdata-devel BuildRequires.
- Rebase dice-eds-changes.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 29 10:16:54 IST 2010 - lakhil@novell.com Thu Apr 29 10:16:54 IST 2010 - lakhil@novell.com

28
evolution-data-server.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package evolution-data-server (Version 2.30.1) # spec file for package evolution-data-server (Version 2.31.6)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,7 +19,7 @@
%define USE_EVOLDAP 0 %define USE_EVOLDAP 0
Name: evolution-data-server Name: evolution-data-server
%define _evo_version 2.30 %define _evo_version 2.32
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel BuildRequires: db-devel
%if %USE_EVOLDAP %if %USE_EVOLDAP
@ -29,12 +29,11 @@ BuildRequires: openldap2-devel
%endif %endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gnome-common
BuildRequires: gperf BuildRequires: gperf
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: intltool BuildRequires: intltool
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libglade2-devel BuildRequires: libgdata-devel
BuildRequires: libgnome-keyring-devel BuildRequires: libgnome-keyring-devel
BuildRequires: libgweather-devel >= 2.25.4 BuildRequires: libgweather-devel >= 2.25.4
BuildRequires: libical-devel >= 0.43 BuildRequires: libical-devel >= 0.43
@ -55,14 +54,12 @@ Obsoletes: evolution-data-server-64bit
Obsoletes: evolution-data-server-32bit Obsoletes: evolution-data-server-32bit
%endif %endif
Summary: Evolution Data Server Summary: Evolution Data Server
Version: 2.30.1 Version: 2.31.6
Release: 1 Release: 1
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream # PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream
Patch0: dice-eds-changes.patch Patch0: dice-eds-changes.patch
# PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
Patch1: evolution-data-server-shared-nss-db.patch
Url: http://www.gnome.org Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
@ -84,21 +81,6 @@ License: GPLv2+
Summary: Evolution Data Server Development Files Summary: Evolution Data Server Development Files
Group: Development/Libraries/GNOME Group: Development/Libraries/GNOME
Requires: evolution-data-server = %{?epoch:}%{version}-%{release} Requires: evolution-data-server = %{?epoch:}%{version}-%{release}
Requires: gconf2-devel
Requires: glib2-devel
Requires: gnome-vfs2-devel
Requires: gtk2-devel
Requires: krb5-devel
Requires: libcom_err
Requires: libglade2-devel
Requires: libgnome-keyring-devel
Requires: libgweather-devel >= 2.25.4
Requires: libgpg-error-devel
Requires: libical-devel >= 0.43
Requires: libsoup-devel
Requires: libxml2-devel
Requires: nss-shared-helper-devel
Requires: sqlite3-devel
%if %USE_EVOLDAP %if %USE_EVOLDAP
Requires: evoldap2-devel Requires: evoldap2-devel
%else %else
@ -131,10 +113,8 @@ documentation.
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
NOCONFIGURE=1 gnome-autogen.sh
%{configure} \ %{configure} \
--libexecdir=%{_libexecdir}/evolution-data-server \ --libexecdir=%{_libexecdir}/evolution-data-server \
%if %USE_EVOLDAP %if %USE_EVOLDAP