From dd18e35c5f152b3b4d982d01c5cd83cb6fc73e1499163c5ae275c27b44da5862 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 23 May 2010 16:45:58 +0000 Subject: [PATCH 1/2] Accepting request 40531 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 40531 revision 3. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/40531 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=80 --- evolution.changes | 8 ++++++++ evolution.spec | 3 +++ 2 files changed, 11 insertions(+) diff --git a/evolution.changes b/evolution.changes index 6b7c1e8..558f9c7 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun May 23 16:29:27 CEST 2010 - vuntz@opensuse.org + +- Move libeconduit.so to the pilot subpackage, to make evolution + not depend on the pilot libraries unless really needed. Fix + bnc#580612. +- Make evolution-pilot supplement evolution and gnome-pilot. + ------------------------------------------------------------------- Thu Apr 29 10:22:24 IST 2010 - lakhil@novell.com diff --git a/evolution.spec b/evolution.spec index acc755f..253378e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -129,6 +129,7 @@ License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) Summary: The Integrated GNOME Mail, Calendar, and Addressbook Suite Group: Productivity/Networking/Email/Clients Requires: evolution = %{version} +Supplements: packageand(%{name}:gnome-pilot} %description pilot Evolution consists of modular components (at the moment: mailer, @@ -276,6 +277,7 @@ fi %dir %{_libdir}/evolution %dir %{_libdir}/evolution/* %{_libdir}/evolution/*/*.so.* +%exclude %{_libdir}/evolution/*/libeconduit.so.* %dir %{_libdir}/evolution/*/modules/ %{_libdir}/evolution/*/modules/*-module-addressbook.* %{_libdir}/evolution/*/modules/*-module-calendar.* @@ -336,6 +338,7 @@ fi %files pilot %defattr(-,root,root) %{_datadir}/gnome-pilot/conduits/*.conduit +%{_libdir}/evolution/*/libeconduit.so.* %{_libdir}/evolution/*/conduits %files mono-plugins From 97f636480b29f45554e4d4e8f0fc625c6425468c6bbd043ea36fdae26c43f362 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 23 May 2010 22:30:02 +0000 Subject: [PATCH 2/2] Updating link to change in openSUSE:Factory/evolution revision 85.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=d38528eb006ebcb5211fa209d35ebae2 --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 253378e..1ae3913 100644 --- a/evolution.spec +++ b/evolution.spec @@ -61,7 +61,7 @@ Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.30 Version: 2.30.1.2 -Release: 1 +Release: 2 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2 # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number