Accepting request 68153 from home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/68153
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=87

evolution-data-server.changes

@@ -1,208 +1,117 @@
+-------------------------------------------------------------------
+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:
+  + Bug Fixes: bgo#646200.
-    - bgo#646200: Insufficient requirement on libsoup
   + Updated translations.
 
 -------------------------------------------------------------------
 Mon Mar 21 16:36:04 UTC 2011 - fcrozat@novell.com
 
 - Update to version 2.91.92:
-  + Bug Fixes:
-    - bgo#629032: GW count is not updated while downloading
-      contacts.
-    - bgo#634663: e-calendar-factory crashes while retracting a
-      meeting.
-    - bgo#641838: More compiler warning fixes
-    - bgo#642783: CamelLocalFolder: Let glibc's realpath() allocate
-      for us.
-    - bgo#643748: Slow message_location search rule with maildir
-      accounts.
-    - bgo#644367: Check NNTP server capabilities before using OVER
-      command.
-    - bgo#644532: Crash when opening ESource with local:/system
-      URI.
   + Miscellaneous Fixes:
     - Improve camel_file_util_encode_fixed_string
     - Allow special CAMEL_DEBUG=pop3 to debug pop3 communication
       only.
-    - Finish documenting the libebackend API.
-    - Improve libedataserver API docs
     - Ensure backend life-time during inner calls
-    - Fix linking in calendar/libegdbus/Makefile.am
     - Coding style and whitespace cleanup.
-    - Remove ESoapMessage and ESoapResponse
+    - Build fixes.
-- Changes from version 2.91.91:
+    - 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#614480: Avoid using G_TYPE_INSTANCE_GET_PRIVATE
-      repeatedly
     - bgo#617763: Cannot create events on Yahoo through CalDAV
-    - bgo#633156: Runtime warning when creating direct subfolder
-      of On This Computer.
-    - bgo#639201: Crash on startup - pop3_get_message,
-      camel_pop3_delete_old.
     - bgo#640829: Can drop text/plain message lines in message
                   preview.
-    - bgo#643095: Crash when opening invalid multipart/signed
+    - Other bugs fixed: bgo#614480, bgo#633156, bgo#639201,
-      message.
+      bgo#643095.
-  + Other Changes:
-    - ECalRecur: Convert intervals < 1 into the default (1)
-    - e_source_copy() may copy also relative_uri
-    - Modularize e-addressbook-factory migration.
-    - Modularize e-calendar-factory migration.
-    - Bump BASE_VERSION to 3.0.
 - Changes from version 2.91.90:
-  + Bug Fixes:
-    - bgo#639483: Category list includes weather information.
-    - bgo#638563: Make string consistent with other providers.
-    - bgo#638246: Runtime warning: and_operator: 
-      assertion `argc == 2' failed.
-    - bgo#638089: Some mobile phone contacts are not shown in
-      preview.
-    - bgo#641757: Fix warnings from GCC 4.6.
-    - bgo#601111: Do not use empty host names in EProxy.
-    - 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 (2nd try).
-    - bgo#641110: Improve 'select destination' window in copy/move
-      to calendar.
-    - bgo#634743: Moving message on GMail with real Trash set
-      deletes it.
   + Miscellaneous Fixes:
-    - CamelTcpStream cleanups.
-    - Memory leak fix and return events in proper order.
-    - Remove NULL checks for GObject methods.
-    - CamelMaildirStore: Fix memory leak
-    - Bump GTK+ requirement to 3.0.
-    - Be able to define DBus call timeout in configure and
-      runtime.
     - 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.
-- Changes from version 2.91.6:
+    - Plug leaks.
+    - Cleanups.
   + Bug Fixes:
-    - bgo#640898: Evolution creates invalid vCard.
+    - bgo#639483: Category list includes weather information.
-    - bgo#623933: Crash under ESourceList::conf_changed_callback.
+    - bgo#638089: Some mobile phone contacts are not shown in
-    - bgo#640529: Default size of category window is too small.
+                  preview.
-    - bgo#636495: Build fails :GtkStyle deprecated.
+    - bgo#641250: Cannot add more than 2 recipients in To: or Cc:
-    - bgo#635519: Crash at cell_renderer_color_render.
+                  field.
-    - bgo#635339: 'Mark as read' from popup menu not working on
+    - bgo#640696: Hidden new messages in On This Computer/Inbox.
-      Junk folder.
+    - bgo#634743: Moving message on GMail with real Trash set
-    - bgo#635353: Don't parse empty addresses in the Google
+                  deletes it.
-      Contacts backend.
+    - Other bugs fixed: bgo#638563, bgo#638246, bgo#641757,
-    - bgo#566441: The Google backend doesn't use the
+      bgo#601111, bgo#641110.
-      tags/categories/groups.
+- Changes from version 2.91.6:
-    - bgo#639469: WebDAV addressbook only uses https.
-    - bgo#627788: EDataCalView is never freed in a factory process.
-    - bgo#639165: maildir expunge not working as expected.
-    - bgo#525565: Crash in find_book_by_contact at
-      e-name-selector-entry.c.
-    - bgo#638948: NNTP folder doesn't implement Expunge
   + Miscellaneous Fixes:
-    - CamelGroupwiseFolder: Dynamically allocate MD5 digest.
-    - Fix possible invalid read when checking citation depth.
-    - Require the latest gtk+-3.0 release until 3.0.
     - Drop support for gtk+-2.0.
     - Add versioning to D-Bus service names.
-    - Kill CamelSeekableStream.
-    - Kill CamelSeekableSubstream.
-    - CamelMultipartSigned: Avoid using bounded streams.
-    - Replace CamelStreamSeekPolicy with GSeekType.
-    - Bump libcamel's shared object name.
     - Make contact removal asynchronous in the Google Contacts
       backend.
     - Add cancellation support to the Google Contacts backend.
-    - Rebase the Google Contacts backend as an asynchronous
+    - Fix crashes.
-      EBookBackend.
+    - Various other fixes.
-    - Add e_source_selector_get_source_by_path().
+  + Bug Fixes:
-    - Bump libgdata dependency to 0.7.0.
+    - bgo#640529: Default size of category window is too small.
-    - Use GDBus calls without any timeout set.
+    - bgo#635339: 'Mark as read' from popup menu not working on
-    - imapx_server_get_message: Avoid unreffing a NULL stream.
+                  Junk folder.
-    - CamelStreamFs: Check for cancellation before closing or
+    - bgo#566441: The Google backend doesn't use the
-      flushing.
+                  tags/categories/groups.
-    - Crash on bogus component removal in file calendar backend.
+    - 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.
-  + Bug Fixes:
+  + Misc fixes.
-    - bgo#637838: Include annotation-glossary.xml in API docs
+  + Bug Fixes: bgo#637838, bgo#637916, bgo#638095.
-    - bgo#637916: configure.ac with_nspr_includes test is incorrect
-    - bgo#638095: Async ops in ENameSelectorEntry can exceed widget
-      lifetime.
-  + Other Changes:
-    - Merge utility functions into Google Contacts backend
-    - Temporarily remove GTK_DISABLE_DEPRECATED.
-    - Change the installation path for E-D-S backends.
 - Changes from version 2.91.4:
-  + Bug Fixes:
-    - bgo#636334: Birthdays&Anniversaries calendar skips local
-      address books.
-    - bgo#636850: Consistent libgweather configure options.
-    - bgo#633180: Attendee uneditable if typed manually.
-    - bgo#420813: Unnecessarily slow update/reopen of webcal
-      calendars.
-    - bgo#634385: Crash in smtp_connect.
-    - bgo#616452: Do not set '-Wl,--no-undefined' on
-      freebsd/openbsd.
-    - bgo#633557: Translation comments needed.
-    - bgo#573125: Crashes right after startup when having broken db
-      summary.
-    - bgo#633332: Preserve port number in WebDAV address book.
-    - bgo#631568: Scheduling Meetings with CalDAV calendars.
-    - bgo#590245: 'evolution --force-shutdown' should kill
-      factories.
-    - bgo#628563: Use-after-free crash in objects_added_cb().
-    - 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.
-    - meego#6498: Filters are not applied to imapx Inboxes.
   + 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.
-- Changes from version 2.91.3
   + Bug Fixes:
-    - bgo#635825: Ensure valid UTF8 strings are passed to
+    - bgo#420813: Unnecessarily slow update/reopen of webcal
-      GDBus/GVariant.
+      calendars.
-    - bgo#624420: Crash camel_imapx_server_append_message.
+    - bgo#633332: Preserve port number in WebDAV address book.
-    - bgo#635673: Stack overflow when opening slow calendar.
+    - bgo#631568: Scheduling Meetings with CalDAV calendars.
-    - bgo#632962: Duplicate "On this computer" sources after
+    - bgo#530205: Use CalDAV calendar read-only when server
-      update.
+      unreachable.
-    - bgo#635572: Various linking failures.
+    - bgo#625048: Fails to detect America/New York system
-    - bgo#635550: e-calendar-factory leaks memory.
+      timezone.
-    - bgo#633780: ESourceSelector - check paths when removing
+    - bnc#590476: Evolution corrupts PDF files.
-      source/group.
+    - bmc#6498: Filters are not applied to imapx Inboxes.
-    - bgo#634573: Crash when importing ics file.
+    - Other bugs fixed: bgo#636334, bgo#636850, bgo#633180,
-    - bgo#633181: Deadlock after moving some mails in maildir.
+      bgo#634385, bgo#616452, bgo#633557, bgo#573125, bgo#590245,
-    - bgo#486553: Inline expansion of email lists are not separated
+      bgo#628563.
-      by commas.
+- Changes from version 2.91.3
-    - bgo#634658: Unread counts for vfolders never update.
-    - bgo#602958: Right click over source in calendar view opens a
-      calendar.
-    - bgo#634593: Maildir hang when create new folders.
-    - bgo#633122: git head 2010-10-25 maildir folders that used to
-      work now don't.
-    - bgo#581288: Remove .ui files from evolution-data-server.
-    - 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.
-    - bgo#631804: Aborts with pthread error in
-      imapx_server_dispose().
-    - bgo#634084: ECal reports loaded state too early.
   + Miscellaneous Fixes:
     - Cannot delete maildir folder.
     - CamelStore: Place Inbox at the top while building folder
@@ -213,136 +122,67 @@ Mon Mar 21 16:36:04 UTC 2011 - fcrozat@novell.com
       in it.
     - Do not unset the deleted flag while copying mails across
       folders.
-    - Make EFileCache changes freezer recursiveable.
+    - Fix QRESYNC protocol violation (rh#648082).
-    - Fix QRESYNC protocol violation(rh#648082).
-- Changes from version 2.91.2:
   + Bug Fixes:
-    - bgo#631073: Task update operation has some delay.
+    - bgo#486553: Inline expansion of email lists are not separated
-    - bgo#631290: Crash in vee_folder_synchronize_sync.
+                  by commas.
-    - bgo#632687: Doesn't build against gtk+ 2.91.1.
+    - bgo#634658: Unread counts for vfolders never update.
-    - bgo#623017: Add introspection support.
+    - bgo#602958: Right click over source in calendar view opens a
-    - bgo#597567: Crash in comp_subject().
+                  calendar.
-    - bgo#632771: Recurring calendar events set to recur forever do
+    - bgo#632692: Thread by In-Reply-To, then first found
-      not display past first week.
+                  reference.
-    - bgo#631953: A possible double-free in google backend.
+    - bgo#538716: Do not set expiration on POP3 message cache
-    - bgo#632030: Crashed while Groupwise server is not responding.
+    - bgo#632676: Only "Checking for new mail" in status bar and
-    - bgo#445439: Delete mail from pop-server when deleted from
+                  nothing else.
-      Inbox/Trash.
+    - Other bugs fixed: bgo#635825, bgo#624420, bgo#635673,
-    - bgo#631842: Improve error reporting in some ECal/EBook
+      bgo#632962, bgo#635572, bgo#635550, bgo#633780, bgo#634573,
-      functions.
+      bgo#633181, bgo#634593, bgo#633122, bgo#581288, bgo#631804,
-    - bgo#632527: Unmatched vFolder returns incorrect uids on
+      bgo#634084.
-      search.
+- Changes from version 2.91.2:
-    - bgo#632177: Hide source group when none source lefts after
-      remove.
-    - bgo#633122: Maildir migration from old folder hierarchy to
-      maildir++ hierarchy.
-    - bgo#632532: Double free in imapx_job_done,
-      imapx_command_step_fetch_done.
-    - bgo#633919: Stuck on Mark messages as read.
-    - bgo#634167: Fails to build with gir.
   + Other Changes:
-    - [IMAPX] Crash on QRESYNC line formatting on 32bit platform.
-    - Fix linking against out-of-tree e-d-s.
     - Fix failure to RSET SMTP connection before re-use.
     - Change the maildir folder hierarchy as per maildir++ spec
-    - override get_full_path and get_meta_path in maildir store
     - Fix remove maildir folder.
     - Fix maildir rename and some memory leaks.
-    - Fix memory leak on imapx_server_get_message() failure.
+    - Misc fixes.
-    - Workaround GtkComboBoxText in .ui file.
+  + Bug Fixes:
-    - camel-folder-search: Fix minor GError handling issue.
+    - bgo#623017: Add introspection support.
-    - ESourceSelector: Add a "primary-selection" property.
+    - bgo#632771: Recurring calendar events set to recur forever do
-    - Fix a build failure due to used CPPFLAGS.
+                  not display past first week.
-    - ENameSelectorDialog: Fix a potential string comparison
+    - bgo#445439: Delete mail from pop-server when deleted from
-      crash.
+                  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#632376: Rewind in camel-disco-diary to fix a crash.
     - bgo#534369: New mail notifications for local Inbox don't
                   work.
     - bgo#630358: Google contacts doesn't sync anniversary.
-    - bgo#608557: CamelOfflineJournal can call fclose with NULL.
-    - bgo#630358: Google contacts doesn't sync birthday and URL.
-    - bgo#631594: Various races in CamelOperation.
     - bgo#347520: Names containing a dot in address parsed
                   incorrectly.
-    - bgo#630361: Categories editing fixes.
+    - Other bugs fixed: bgo#632376, bgo#608557, bgo#630358,
-    - bgo#630889: Use-after-free while sending messages.
+      bgo#631594, bgo#630361, bgo#630889, bgo#631404.
-    - bgo#631404: Stop shipping a Locations.xml.
-  + Miscellaneous Fixes:
-    - Prefix soup_soap_(message/response) with e_soap and add it
-      in libedataserver so that groupwise, evolution-ews and
-      evolution-sync for ews.
-    - Google contacts - do not drop all URLs/events on update.
-    - Add a CamelFolder:uri property.
-    - Include also reason_phrase on libsoup errors.
-    - CamelOperation: Try to avoid crashing on refcount errors.
-    - Really fix srcdir != builddir builds.
-    - Limit libgdata support to 0.6.
 - Changes from version 2.91.0:
-  + Bug Fixes:
-    - bgo#629714: endless loop in imapx_parse_status()
-    - bgo#630135: No UI feedback when imapx connection fails
-    - bgo#630150: imapx attempts to connect to server when already
-      cancelled.
-    - bgo#630152: imapx_parser_thread registers wrong operation
-    - bgo#629752: ldap doesn't work in offline.
-    - bgo#616598: AM/PM in Date header confuses parser.
-    - bgo#615274: Encode proxy user/password in proxy URL.
-    - bgo#628655: imapx parser thread gerror memory leak.
-    - bgo#615828: Incorrectly set off-line state on
-      CamelOfflineStore.
-    - bgo#629916: imapx fails to handle errors in
-      imapx_command_idle_stop().
-    - bgo#616596: Disable debug prints from e-categories.c.
-    - bgo#629726: Increase imapx starting buffer size to 4KiB
-    - bgo#629908: assertion failed: (E_IS_BOOK (book)).
-    - bgo#630321: Disabling IMAPX account produces runtime
-      warnings.
-    - bgo#630149: imapx_sync() never returns error.
-    - bgo#599741: Cannot accept meeting reques.
-    - bgo#630265: Refetches unchanged 'On The Web' calendar.
-    - bgo#629507: e_book_backend_cache_set_time doesn't rewrite old
-      value.
-    - bgo#616172: Return NULL from imapx_find_commad_tag when not
-      found.
-    - bgo#630222: Build failure camel-tcp-stream-raw.c.
   + Other Changes:
     - bmc#3667 - SOCKS5 failure doesn't fall back to SOCKS4
-    - Recast CamelOperation as a GCancellable subclass.
-    - Fix a potential race in operation_idle_cb().
-    - Move printf inside camel_imapx_debug() macro to make prefixes
-      easier.
-    - Add server tagprefix to imapx debug output messages.
-    - Use correct debug tagprefix in imapx_parse_capability().
     - Update license to LGPLv2 for e-debug-log files.
     - Updated licenses for imapx to LGPLv2.
-    - Use new GDK keysym names if available.
+    - Many other  code updates.
-    - Sanitize error handling in the SOCKS5/SOCKS4 code paths
+  + Bug Fixes:
-    - Fix potential use-after-free in ECal, as with EBook bug
+    - bgo#630135: No UI feedback when imapx connection fails
-      bgo#629908.
+    - bgo#629752: ldap doesn't work in offline.
-    - Use GCancellable in all methods that may block.
+    - bgo#616598: AM/PM in Date header confuses parser.
-    - Rename blocking Camel methods.
+    - Other bugs fixed: bgo#629714, bgo#630150, bgo#630152,
-    - Camel: Add an asynchronous API.
+      bgo#615274, bgo#628655, bgo#615828, bgo#629916, bgo#616596,
-    - Camel: Adapt tests to API changes.
+      bgo#629726, bgo#629908, bgo#630321, bgo#630149, bgo#599741,
-    - Bump Camel's soname for all this API breakage.
+      bgo#630265, bgo#629507, bgo#616172, bgo#630222.
-    - Bump gtk+-2.0 requirement to 2.22.0.
-    - Fix GCancellable usage in IMAPX threads.
-    - Have camel_operation_new() return a GCancellable.
-    - Use macros for CamelOperation timeouts.
-    - Adapt to GtkObject removal in GTK3.
-    - Emit CamelFolder and CamelStore signals from idle callbacks.
-    - Don't link libebook to GTK+.
-    - Use upstream gettext instead glib one.
-    - IMAPX: Use a CamelOperation, not GCancellable in the parser
-      thread.
-    - No need to allocate colors with cairo drawing.
-    - CamelStore: Forgot a part in store_get_folder_info().
-    - Collect Camel flags into enum types.
-    - Avoid passing NULL to g_strstrip in e_contact_get calls.
 - Many sonames have changed with gtk3/gnome3 port.
-- Add pkgconfig(gtk+-3.0) as BuildRequires
+- 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.

evolution-data-server.spec

@@ -32,6 +32,16 @@
 
 Name:           evolution-data-server
 %define _evo_version 3.0
+License:        LGPLv2+
+Group:          Development/Libraries/GNOME
+Version:        3.0.0
+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
@@ -59,6 +68,13 @@ 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
@@ -66,30 +82,13 @@ Obsoletes:      evolution-data-server-64bit
 %ifarch  %ix86 ppc
 Obsoletes:      evolution-data-server-32bit
 %endif
-Version:        3.0.0
-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
 
@@ -100,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
 
@@ -112,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
 
@@ -124,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
 
@@ -136,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
 
@@ -148,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
 
@@ -160,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
 
@@ -172,8 +159,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library.
 
 %package -n libedataserverui-3_0-%{so_edataserverui}
-
-
 Summary:        Evolution Data Server - Graphical Utilities Library
 Group:          System/Libraries
 
@@ -184,8 +169,6 @@ 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
 
@@ -320,7 +303,9 @@ find %{buildroot} -name '*.la' -type f -delete -print
 %{_datadir}/pixmaps/evolution-data-server/
 %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.*.service
 %{_libdir}/evolution-data-server/
+%if "%{_libdir}" != "%{_libexecdir}"
 %{_libexecdir}/evolution-data-server/
+%endif
 
 %files -n libcamel-1_2-%{so_camel}
 %defattr(-, root, root)
@@ -338,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)
@@ -350,6 +336,7 @@ 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-3_0-%{so_edataserverui}
 %defattr(-, root, root)
@@ -364,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)