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

Accepting request 69030 from GNOME:Factory

Browse Source 
Pushing G:F (including GNOME3)

OBS-URL: https://build.opensuse.org/request/show/69030
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=86
This commit is contained in:
Sascha Peilicke 2011-05-05 10:53:54 +00:00 committed by Git OBS Bridge
commit e71cd43e0d
6 changed files with 278 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
baselibs.conf
View File

@ -1,9 +1,9 @@
libcamel-1_2-19
libebackend-1_2-0
libcamel-1_2-23
libebackend-1_2-1
libebook-1_2-10
libecal-1_2-8
libedata-book-1_2-8
libedata-cal-1_2-10
libedata-book-1_2-9
libedata-cal-1_2-11
libedataserver-1_2-14
libedataserverui-1_2-11
libedataserverui-3_0-0
libegroupwise-1_2-13

55
dice-eds-changes.patch
View File

@ -1,8 +1,8 @@
Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
Index: evolution-data-server-2.91.90/calendar/libecal/e-cal-component.c
===================================================================
--- evolution-data-server-2.31.92.orig/calendar/libecal/e-cal-component.c
+++ evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
@@ -163,6 +163,8 @@ struct _ECalComponentPrivate {
--- evolution-data-server-2.91.90.orig/calendar/libecal/e-cal-component.c
+++ evolution-data-server-2.91.90/calendar/libecal/e-cal-component.c
@@ -169,6 +169,8 @@ struct _ECalComponentPrivate {
* object over the wire.
*/
guint need_sequence_inc : 1;
@ -11,7 +11,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
};
/* Private structure for alarms */
@@ -335,6 +337,9 @@ free_icalcomponent (ECalComponent *comp,
@@ -355,6 +357,9 @@ free_icalcomponent (ECalComponent *comp,
/* Free the subcomponents */
g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL);
@ -21,7 +21,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/* Free the icalcomponent */
@@ -497,6 +502,13 @@ e_cal_component_clone (ECalComponent *co
@@ -517,6 +522,13 @@ e_cal_component_clone (ECalComponent *co
return new_comp;
}
@ -35,7 +35,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/* Scans an attachment property */
static void
scan_attachment (GSList **attachment_list, icalproperty *prop)
@@ -759,7 +771,8 @@ scan_property (ECalComponent *comp, ical
@@ -779,7 +791,8 @@ scan_property (ECalComponent *comp, ical
case ICAL_LOCATION_PROPERTY :
priv->location = prop;
break;
@ -45,7 +45,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
default:
break;
}
@@ -915,6 +928,9 @@ scan_icalcomponent (ECalComponent *comp)
@@ -932,6 +945,9 @@ scan_icalcomponent (ECalComponent *comp)
g_return_if_fail (priv->icalcomp != NULL);
@ -55,7 +55,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/* Scan properties */
for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY);
@@ -1013,7 +1029,9 @@ e_cal_component_set_new_vtype (ECalCompo
@@ -1030,7 +1046,9 @@ e_cal_component_set_new_vtype (ECalCompo
case E_CAL_COMPONENT_TIMEZONE:
kind = ICAL_VTIMEZONE_COMPONENT;
break;
@ -66,7 +66,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
default:
g_warn_if_reached ();
kind = ICAL_NO_COMPONENT;
@@ -1031,8 +1049,8 @@ e_cal_component_set_new_vtype (ECalCompo
@@ -1048,8 +1066,8 @@ e_cal_component_set_new_vtype (ECalCompo
scan_icalcomponent (comp);
/* Add missing stuff */
@ -77,7 +77,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
}
/**
@@ -1055,6 +1073,7 @@ e_cal_component_set_icalcomponent (ECalC
@@ -1072,6 +1090,7 @@ e_cal_component_set_icalcomponent (ECalC
{
ECalComponentPrivate *priv;
icalcomponent_kind kind;
@ -85,7 +85,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
g_return_val_if_fail (comp != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
@@ -1077,13 +1096,17 @@ e_cal_component_set_icalcomponent (ECalC
@@ -1094,13 +1113,17 @@ e_cal_component_set_icalcomponent (ECalC
|| kind == ICAL_VTODO_COMPONENT
|| kind == ICAL_VJOURNAL_COMPONENT
|| kind == ICAL_VFREEBUSY_COMPONENT
@ -105,27 +105,34 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
return TRUE;
}
@@ -1122,6 +1145,7 @@ void
@@ -1138,6 +1161,7 @@ e_cal_component_get_icalcomponent (ECalC
void
e_cal_component_rescan (ECalComponent *comp)
{
ECalComponentPrivate *priv;
+ ECalComponentVType vtype;
g_return_if_fail (comp != NULL);
g_return_if_fail (E_IS_CAL_COMPONENT (comp));
@@ -1133,7 +1157,10 @@ e_cal_component_rescan (ECalComponent *c
@@ -1146,7 +1170,9 @@ e_cal_component_rescan (ECalComponent *c
/* Rescan */
scan_icalcomponent (comp);
- ensure_mandatory_properties (comp);
+
+ vtype = e_cal_component_get_vtype (comp);
+ if (vtype != E_CAL_COMPONENT_VCALENDAR && vtype != E_CAL_COMPONENT_TIMEZONE && vtype != E_CAL_COMPONENT_FREEBUSY);
+ ensure_mandatory_properties (comp);
}
/**
@@ -1194,6 +1221,9 @@ e_cal_component_get_vtype (ECalComponent
@@ -1161,6 +1187,7 @@ void
e_cal_component_strip_errors (ECalComponent *comp)
{
ECalComponentPrivate *priv;
+ ECalComponentVType vtype;
g_return_if_fail (comp != NULL);
g_return_if_fail (E_IS_CAL_COMPONENT (comp));
@@ -1207,6 +1234,9 @@ e_cal_component_get_vtype (ECalComponent
case ICAL_VTIMEZONE_COMPONENT:
return E_CAL_COMPONENT_TIMEZONE;
@ -135,7 +142,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
default:
/* We should have been loaded with a supported type! */
g_warn_if_reached ();
@@ -2586,6 +2616,27 @@ e_cal_component_set_dtstart (ECalCompone
@@ -2685,6 +2715,27 @@ e_cal_component_set_dtstart (ECalCompone
priv->need_sequence_inc = TRUE;
}
@ -163,7 +170,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/**
* e_cal_component_get_due:
* @comp: A calendar component object.
@@ -4039,6 +4090,24 @@ e_cal_component_get_sequence (ECalCompon
@@ -4138,6 +4189,24 @@ e_cal_component_get_sequence (ECalCompon
**sequence = icalproperty_get_sequence (priv->sequence);
}
@ -188,7 +195,7 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
/**
* e_cal_component_set_sequence:
* @comp: A calendar component object.
@@ -5964,3 +6033,77 @@ e_cal_component_event_dates_match (ECalC
@@ -6063,3 +6132,77 @@ e_cal_component_event_dates_match (ECalC
return retval;
}
@ -266,10 +273,10 @@ Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.c
+
+ return -1;
+}
Index: evolution-data-server-2.31.92/calendar/libecal/e-cal-component.h
Index: evolution-data-server-2.91.90/calendar/libecal/e-cal-component.h
===================================================================
--- evolution-data-server-2.31.92.orig/calendar/libecal/e-cal-component.h
+++ evolution-data-server-2.31.92/calendar/libecal/e-cal-component.h
--- evolution-data-server-2.91.90.orig/calendar/libecal/e-cal-component.h
+++ evolution-data-server-2.91.90/calendar/libecal/e-cal-component.h
@@ -51,7 +51,8 @@ typedef enum {
E_CAL_COMPONENT_TODO,
E_CAL_COMPONENT_JOURNAL,

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

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

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

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

198
evolution-data-server.changes
View File

@ -1,3 +1,201 @@
-------------------------------------------------------------------
Wed Apr 27 09:59:07 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.1:
+ Fix few memory leaks.
+ Bug Fixes: bgo#645498, bgo#645783, bgo#645845, bgo#647873,
bgo#647873, bgo#646117.
+ Updated translations.
-------------------------------------------------------------------
Fri Apr 22 10:45:09 CEST 2011 - vuntz@opensuse.org
- Add gobject-introspection-devel BuildRequires to build
introspection support.
- Do not package files twice between
%{_libdir}/evolution-data-server/ and
%{_libexecdir}/evolution-data-server/.
-------------------------------------------------------------------
Mon Apr 4 13:05:48 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0:
+ Bug Fixes: bgo#646200.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 21 16:36:04 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.92:
+ Miscellaneous Fixes:
- Improve camel_file_util_encode_fixed_string
- Allow special CAMEL_DEBUG=pop3 to debug pop3 communication
only.
- Ensure backend life-time during inner calls
- Coding style and whitespace cleanup.
- Build fixes.
- Documentation improvements.
+ Bug Fixes:
- bgo#629032: GW count is not updated while downloading
contacts.
- bgo#643748: Slow message_location search rule with maildir
accounts.
- bgo#644367: Check NNTP server capabilities before using OVER
command.
- Other bugs fixed: bgo#634663, bgo#641838, bgo#642783,
bgo#644532.
- Changes from version 2.91.91:
+ Various small changes.
+ Bug Fixes:
- bgo#617763: Cannot create events on Yahoo through CalDAV
- bgo#640829: Can drop text/plain message lines in message
preview.
- Other bugs fixed: bgo#614480, bgo#633156, bgo#639201,
bgo#643095.
- Changes from version 2.91.90:
+ Miscellaneous Fixes:
- Perform consistency check on local folders based on the
parameter 'need-summary-check'.
- Add a --keep-running option to e-calendar-factory.
- Add a --keep-running option to e-addressbook-factory.
- Improve libebook annotations.
- Plug leaks.
- Cleanups.
+ Bug Fixes:
- bgo#639483: Category list includes weather information.
- bgo#638089: Some mobile phone contacts are not shown in
preview.
- bgo#641250: Cannot add more than 2 recipients in To: or Cc:
field.
- bgo#640696: Hidden new messages in On This Computer/Inbox.
- bgo#634743: Moving message on GMail with real Trash set
deletes it.
- Other bugs fixed: bgo#638563, bgo#638246, bgo#641757,
bgo#601111, bgo#641110.
- Changes from version 2.91.6:
+ Miscellaneous Fixes:
- Drop support for gtk+-2.0.
- Add versioning to D-Bus service names.
- Make contact removal asynchronous in the Google Contacts
backend.
- Add cancellation support to the Google Contacts backend.
- Fix crashes.
- Various other fixes.
+ Bug Fixes:
- bgo#640529: Default size of category window is too small.
- bgo#635339: 'Mark as read' from popup menu not working on
Junk folder.
- bgo#566441: The Google backend doesn't use the
tags/categories/groups.
- bgo#639469: WebDAV addressbook only uses https.
- bgo#639165: maildir expunge not working as expected.
- bgo#638948: NNTP folder doesn't implement Expunge
- Other bugs fixed: bgo#640898, bgo#623933, bgo#636495,
bgo#635519, bgo#635353, bgo#627788, bgo#525565.
- Changes from version 2.91.5:
+ Address book and calendar backend modules are now split into
different installation directories so the D-Bus factory
processes will only load relevant backend modules. This
changes some pkg-config details for third-party backend
modules.
+ Misc fixes.
+ Bug Fixes: bgo#637838, bgo#637916, bgo#638095.
- Changes from version 2.91.4:
+ Miscellaneous Fixes:
- Do not store and generate locel:/system URIs.
- Maildir: Hide folders which do not start with a dot.
- Drop support for password key files.
- Use less threads in CamelDB.
+ Bug Fixes:
- bgo#420813: Unnecessarily slow update/reopen of webcal
calendars.
- bgo#633332: Preserve port number in WebDAV address book.
- bgo#631568: Scheduling Meetings with CalDAV calendars.
- bgo#530205: Use CalDAV calendar read-only when server
unreachable.
- bgo#625048: Fails to detect America/New York system
timezone.
- bnc#590476: Evolution corrupts PDF files.
- bmc#6498: Filters are not applied to imapx Inboxes.
- Other bugs fixed: bgo#636334, bgo#636850, bgo#633180,
bgo#634385, bgo#616452, bgo#633557, bgo#573125, bgo#590245,
bgo#628563.
- Changes from version 2.91.3
+ Miscellaneous Fixes:
- Cannot delete maildir folder.
- CamelStore: Place Inbox at the top while building folder
info.
- Maildir: Use Inbox instead of '.' while building folder info.
- Maildir: Allow subfolders for Inbox.
- Use '_' instead of '^' for renaming folders with dot symbol
in it.
- Do not unset the deleted flag while copying mails across
folders.
- Fix QRESYNC protocol violation (rh#648082).
+ Bug Fixes:
- bgo#486553: Inline expansion of email lists are not separated
by commas.
- bgo#634658: Unread counts for vfolders never update.
- bgo#602958: Right click over source in calendar view opens a
calendar.
- bgo#632692: Thread by In-Reply-To, then first found
reference.
- bgo#538716: Do not set expiration on POP3 message cache
- bgo#632676: Only "Checking for new mail" in status bar and
nothing else.
- Other bugs fixed: bgo#635825, bgo#624420, bgo#635673,
bgo#632962, bgo#635572, bgo#635550, bgo#633780, bgo#634573,
bgo#633181, bgo#634593, bgo#633122, bgo#581288, bgo#631804,
bgo#634084.
- Changes from version 2.91.2:
+ Other Changes:
- Fix failure to RSET SMTP connection before re-use.
- Change the maildir folder hierarchy as per maildir++ spec
- Fix remove maildir folder.
- Fix maildir rename and some memory leaks.
- Misc fixes.
+ Bug Fixes:
- bgo#623017: Add introspection support.
- bgo#632771: Recurring calendar events set to recur forever do
not display past first week.
- bgo#445439: Delete mail from pop-server when deleted from
Inbox/Trash.
- Other bugs fixed: bgo#631073, bgo#631290, bgo#632687,
bgo#597567, bgo#631953, bgo#632030, bgo#631842, bgo#632527,
bgo#632177, bgo#633122, bgo#632532, bgo#633919, bgo#634167.
- Changes from version 2.91.1:
+ Miscellaneous Fixes:
- Google contacts - do not drop all URLs/events on update.
- Misc fixes.
+ Bug Fixes:
- bgo#558478: Autocompletion inserts comma.
- bgo#534369: New mail notifications for local Inbox don't
work.
- bgo#630358: Google contacts doesn't sync anniversary.
- bgo#347520: Names containing a dot in address parsed
incorrectly.
- Other bugs fixed: bgo#632376, bgo#608557, bgo#630358,
bgo#631594, bgo#630361, bgo#630889, bgo#631404.
- Changes from version 2.91.0:
+ Other Changes:
- bmc#3667 - SOCKS5 failure doesn't fall back to SOCKS4
- Update license to LGPLv2 for e-debug-log files.
- Updated licenses for imapx to LGPLv2.
- Many other code updates.
+ Bug Fixes:
- bgo#630135: No UI feedback when imapx connection fails
- bgo#629752: ldap doesn't work in offline.
- bgo#616598: AM/PM in Date header confuses parser.
- Other bugs fixed: bgo#629714, bgo#630150, bgo#630152,
bgo#615274, bgo#628655, bgo#615828, bgo#629916, bgo#616596,
bgo#629726, bgo#629908, bgo#630321, bgo#630149, bgo#599741,
bgo#630265, bgo#629507, bgo#616172, bgo#630222.
- Many sonames have changed with gtk3/gnome3 port.
- Add pkgconfig(gtk+-3.0) BuildRequires.
- Remove obsolete configure options (with-krb4, gnome-keyring,
enable-nss, enable-nspr, enable-hula, enable-exchange)
- Rebase dice-eds-changes.patch.
-------------------------------------------------------------------
Tue Nov 16 09:22:51 CET 2010 - dimstar@opensuse.org

100
evolution-data-server.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package evolution-data-server (Version 2.32.1)
# spec file for package evolution-data-server
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,18 +20,28 @@
# Shared Library soNUMs, to make it easier for updates
# When updating the sonums, do not forget to also update baselibs.conf
%define so_camel 19
%define so_ebackend 0
%define so_camel 23
%define so_ebackend 1
%define so_ebook 10
%define so_ecal 8
%define so_edata_book 8
%define so_edata_cal 10
%define so_edata_book 9
%define so_edata_cal 11
%define so_edataserver 14
%define so_edataserverui 11
%define so_edataserverui 0
%define so_egroupwise 13
Name: evolution-data-server
%define _evo_version 2.32
%define _evo_version 3.0
License: LGPLv2+
Group: Development/Libraries/GNOME
Version: 3.0.1
Release: 1
Summary: Evolution Data Server
Url: http://www.gnome.org
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream
Patch0: dice-eds-changes.patch
BuildRequires: bison
BuildRequires: db-devel
%if %USE_EVOLDAP
@ -39,10 +49,9 @@ BuildRequires: evoldap2-devel
%else
BuildRequires: openldap2-devel
%endif
License: LGPLv2+
Group: Development/Libraries/GNOME
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gobject-introspection-devel
BuildRequires: gperf
BuildRequires: gtk-doc
BuildRequires: intltool
@ -56,8 +65,16 @@ BuildRequires: libsoup-devel
BuildRequires: mozilla-nss-devel
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: sqlite3-devel
BuildRequires: translation-update-upstream
%if %USE_EVOLDAP
Requires: libevoldap-2_4-2
%endif
Requires: libical0 >= 0.43
Requires: libsoup >= 2.2.6
Requires: mozilla-nss
Recommends: %{name}-lang = %{version}
# bug437293
%ifarch ppc64
Obsoletes: evolution-data-server-64bit
@ -65,30 +82,13 @@ Obsoletes: evolution-data-server-64bit
%ifarch %ix86 ppc
Obsoletes: evolution-data-server-32bit
%endif
Version: 2.32.1
Release: 1
Summary: Evolution Data Server
Url: http://www.gnome.org
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream
Patch0: dice-eds-changes.patch
Requires: libsoup >= 2.2.6
Requires: mozilla-nss
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %USE_EVOLDAP
Requires: libevoldap-2_4-2
%endif
Requires: libical0 >= 0.43
%description
Evolution Data Server provides a central location for your address book
and calendar in the GNOME Desktop.
%package -n libcamel-1_2-%{so_camel}
Summary: Evolution Data Server - Messaging Library
Group: System/Libraries
@ -99,8 +99,6 @@ and calendar in the GNOME Desktop.
This package contains a shared system library for messaging.
%package -n libebackend-1_2-%{so_ebackend}
Summary: Evolution Data Server - Backend Utilities Library
Group: System/Libraries
@ -111,8 +109,6 @@ and calendar in the GNOME Desktop.
This package contains a shared system library for backends.
%package -n libebook-1_2-%{so_ebook}
Summary: Evolution Data Server - Address Book Client Library
Group: System/Libraries
@ -123,8 +119,6 @@ and calendar in the GNOME Desktop.
This package contains a shared system library to access address books.
%package -n libecal-1_2-%{so_ecal}
Summary: Evolution Data Server - Calendar Client Library
Group: System/Libraries
@ -135,8 +129,6 @@ and calendar in the GNOME Desktop.
This package contains a shared system library to access calendars.
%package -n libedata-book-1_2-%{so_edata_book}
Summary: Evolution Data Server - Address Book Backend Library
Group: System/Libraries
@ -147,8 +139,6 @@ and calendar in the GNOME Desktop.
This package contains a shared system library for address book backends.
%package -n libedata-cal-1_2-%{so_edata_cal}
Summary: Evolution Data Server - Calendar Backend Library
Group: System/Libraries
@ -159,8 +149,6 @@ and calendar in the GNOME Desktop.
This package contains a shared system library for calendar backends.
%package -n libedataserver-1_2-%{so_edataserver}
Summary: Evolution Data Server - Utilities Library
Group: System/Libraries
@ -170,21 +158,17 @@ and calendar in the GNOME Desktop.
This package contains a shared system library.
%package -n libedataserverui-1_2-%{so_edataserverui}
%package -n libedataserverui-3_0-%{so_edataserverui}
Summary: Evolution Data Server - Graphical Utilities Library
Group: System/Libraries
%description -n libedataserverui-1_2-%{so_edataserverui}
%description -n libedataserverui-3_0-%{so_edataserverui}
Evolution Data Server provides a central location for your address book
and calendar in the GNOME Desktop.
This package contains a shared system library.
%package -n libegroupwise-1_2-%{so_egroupwise}
Summary: Evolution Data Server - Groupwise Library
Group: System/Libraries
@ -206,7 +190,7 @@ Requires: libecal-1_2-%{so_ecal} = %{version}
Requires: libedata-book-1_2-%{so_edata_book} = %{version}
Requires: libedata-cal-1_2-%{so_edata_cal} = %{version}
Requires: libedataserver-1_2-%{so_edataserver} = %{version}
Requires: libedataserverui-1_2-%{so_edataserverui} = %{version}
Requires: libedataserverui-3_0-%{so_edataserverui} = %{version}
Requires: libegroupwise-1_2-%{so_egroupwise} = %{version}
%if %USE_EVOLDAP
Requires: evoldap2-devel
@ -247,19 +231,12 @@ translation-update-upstream
--with-openldap=yes \
%endif
--with-krb5=%{_prefix} \
--with-krb4=%{_prefix} \
--enable-gnome-keyring \
--enable-gtk-doc \
--enable-ipv6=yes \
--enable-nss=yes \
--enable-nspr=yes \
--enable-smime=yes \
--enable-nntp=yes \
--enable-hula=yes \
--enable-exchange=yes \
--with-e2k-debug \
--disable-static
%{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} V=1
%install
%{makeinstall}
@ -309,9 +286,9 @@ find %{buildroot} -name '*.la' -type f -delete -print
%postun -n libedataserver-1_2-%{so_edataserver} -p /sbin/ldconfig
%post -n libedataserverui-1_2-%{so_edataserverui} -p /sbin/ldconfig
%post -n libedataserverui-3_0-%{so_edataserverui} -p /sbin/ldconfig
%postun -n libedataserverui-1_2-%{so_edataserverui} -p /sbin/ldconfig
%postun -n libedataserverui-3_0-%{so_edataserverui} -p /sbin/ldconfig
%post -n libegroupwise-1_2-%{so_egroupwise} -p /sbin/ldconfig
@ -325,8 +302,10 @@ find %{buildroot} -name '*.la' -type f -delete -print
# Category icons that are used by libedataserver
%{_datadir}/pixmaps/evolution-data-server/
%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.*.service
%{_libdir}/evolution-data-server-1.2/
%{_libdir}/evolution-data-server/
%if "%{_libdir}" != "%{_libexecdir}"
%{_libexecdir}/evolution-data-server/
%endif
%files -n libcamel-1_2-%{so_camel}
%defattr(-, root, root)
@ -344,6 +323,7 @@ find %{buildroot} -name '*.la' -type f -delete -print
%files -n libecal-1_2-%{so_ecal}
%defattr(-, root, root)
%{_libdir}/libecal-1.2.so.%{so_ecal}*
%{_libdir}/girepository-1.0/ECalendar-1.2.typelib
%files -n libedata-book-1_2-%{so_edata_book}
%defattr(-, root, root)
@ -356,10 +336,11 @@ find %{buildroot} -name '*.la' -type f -delete -print
%files -n libedataserver-1_2-%{so_edataserver}
%defattr(-, root, root)
%{_libdir}/libedataserver-1.2.so.%{so_edataserver}*
%{_libdir}/girepository-1.0/EDataServer-1.2.typelib
%files -n libedataserverui-1_2-%{so_edataserverui}
%files -n libedataserverui-3_0-%{so_edataserverui}
%defattr(-, root, root)
%{_libdir}/libedataserverui-1.2.so.%{so_edataserverui}*
%{_libdir}/libedataserverui-3.0.so.%{so_edataserverui}*
%files -n libegroupwise-1_2-%{so_egroupwise}
%defattr(-, root, root)
@ -370,6 +351,7 @@ find %{buildroot} -name '*.la' -type f -delete -print
%{_includedir}/evolution-data-server-%{_evo_version}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/gir-1.0/*.gir
%files doc
%defattr(-, root, root)