Accepting request 43288 from home:dimstar:branches:GNOME:Factory

Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 43288 revision 14.
Request was accepted with message:
thanks, will clean it up a bit

OBS-URL: https://build.opensuse.org/request/show/43288
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=85

evolution-2.30.1.2.tar.bz2

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

evolution-2.31.5.tar.bz2

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

evolution.changes

@@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Tue Jul 13 08:40:48 UTC 2010 - dimstar@opensuse.org
+
+- Update to version 2.31.5:
+  + Fix places where "~/.evolution" is hard-coded
+  + Migrate from CamelException to GError
+  + Fix transience problems with ENameSelectorDialogs ...
+  + Allow edit accounts in the capplet to go fwd/back
+  + Work around sudden disappearance of GdkRegion in GTK+ 2.90.5.
+  + bgo#624128: Folder -> Subscriptions is always enabled
+  + bgo#621839: Improve auto-selection of messages
+  + bgo#623702: SEGV on redirecting message
+  + bgo#623738: Select All is always enabled for message list
+  + bgo#623947: Error handling issues in em-format.c
+  + bgo#624011: EMeetingTimeSelector tries to change mouse cursor
+    before it's realized
+  + bgo#624022: "stock_mail-import" no longer exists in
+    gnome-icon-theme
+  + bgo#623204: Be able to report detailed errors from backends
+  + bgo#623769: Post Message to List asks for confirmation on close
+  + bgo#623432: Use gweather-3.0 when building with gtk3
+  + bgo#623201: Set default options automatically while creating a
+    new account.
+- Disable bnc-440634-forwarded-hide-accept-decline.patch and
+  bnc-435668-hide-accept.patch: patches need to be rebased for
+  CAMEL API change (name is no longer a property)
+
+-------------------------------------------------------------------
+Mon Jul 12 12:45:38 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 2.31.4:
+  + Add more missing icons for GtkhtmlEditor.
+  + More GTK3 preparation.
+  + Hook up GNOME's configured SOCKS4 proxy in the mail session
+  + Convert "startup-wizard" to an EExtension.
+  + Use the send_port, not the recv_port, when configuring SMTP for
+    an account
+  + [win32] Relocate the position of mail-autoconfig directory
+  + Use EWebView functions whenever possible.
+  + Fix alignment of lblCarset in composer-prefs-dialog
+  + Simplify the Notes tab in Contact Editor.
+  + Install evolution-alarm-notify into bindir for windows
+  + [win32] Set a path in evolution-alarm-notify binary, so it
+    finds its dependencies even if it is started by a link in
+    StartUp submenu of Program menu.
+  + Revert "don't bridge to the active-view gconf setting"
+  + Merge branch 'express2'
+  + Add tooltips for print button on CompEditor toolbar.
+  + For an extensive list, see NEWS
+- Drop evolution-bnc576165-mono-plugin-crash.patch, merged upstream
+- BuildRequire libgdata-devel.
+
+-------------------------------------------------------------------
+Fri May 28 07:30:49 UTC 2010 - lnussel@suse.de
+
+- remove build dependency on libytnef as it's not used anyways. The
+  tnef plugin is experimental and has security issues so we don't
+  want to enable it (bnc#609013)
+
+-------------------------------------------------------------------
+Wed May 26 13:06:24 UTC 2010 - dimstar@opensuse.org
+
+- Add evolution-bnc576165-mono-plugin-crash.patch: fix sigsegv in
+  mono plugin registration (bnc#576165).
+
 -------------------------------------------------------------------
 Sun May 23 16:29:27 CEST 2010 - vuntz@opensuse.org
 

evolution.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package evolution (Version 2.30.1.2)
+# spec file for package evolution (Version 2.31.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -30,7 +30,6 @@ BuildRequires:  evolution-data-server-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-desktop-devel
 BuildRequires:  gnome-icon-theme-devel
 BuildRequires:  gnome-patch-translation
 BuildRequires:  gnome-pilot-devel
@@ -40,16 +39,20 @@ BuildRequires:  gtkhtml2-devel
 BuildRequires:  gtkimageview-devel
 BuildRequires:  intltool
 BuildRequires:  libcanberra-devel
+BuildRequires:  libgdata-devel
 BuildRequires:  libgweather-devel >= 2.25.4
 BuildRequires:  libnotify-devel
 BuildRequires:  libpisock-devel
 BuildRequires:  libpisync-devel
 BuildRequires:  libpst-devel
-BuildRequires:  libunique-devel
+BuildRequires:  pkgconfig(unique-1.0)
-BuildRequires:  libytnef-devel
+# don't you ever enable this! It's experimental and insecure (bnc#609013)
+#BuildRequires:  libytnef-devel
 BuildRequires:  mozilla-nss-devel
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pilot-link
+# This should only be needed until evolution is fully ported to the gnome3 stack.
+BuildRequires:  pkgconfig(gnome-desktop-2.0)
 BuildRequires:  psmisc
 BuildRequires:  python-devel
 BuildRequires:  shared-mime-info
@@ -59,18 +62,18 @@ BuildRequires:  update-desktop-files
 License:        LGPLv2.0 ; LGPLv3
 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
+%define evolution_base_version 3.0
-Version:        2.30.1.2
+Version:        2.31.5
-Release:        2
+Release:        1
 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
 Patch7:         calendar-sendbutton.patch
 # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
 Patch15:        evolution-custom-openldap-includes.patch
-# PATCH-FEATURE-OPENSUSE evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
+# PATCH-NEEDS-REBASE: evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.(WAS: PATCH-FEATURE-OPENSUSE)
 Patch16:        evolution-shared-nss-db.patch
-# PATCH-FIX-UPSTREAM  bnc-435668-hide-accept.patch bnc#435668 -- Meetings In SentItems Should Hide Accept/Decline.
+# PATCH-NEEDS-REBASE bnc-435668-hide-accept.patch bnc#435668 -- Meetings In SentItems Should Hide Accept/Decline. (WAS: PATCH-FIX-UPSTREAM)
 Patch18:        bnc-435668-hide-accept.patch
 # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
 Patch19:        bnc-435722-book-uri-long.patch
@@ -86,7 +89,7 @@ Patch36:        sp-tasks-setup.diff
 Patch41:        sp-meetingworkspace-ui.patch
 # PATCH-NEEDS-REBASE bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM)
 Patch42:        bnc-449888-handle-no-workspace.patch
-# PATCH-FIX-SLED bnc-440634-forwarded-hide-accept-decline.patch bnc440634 abharath@suse.de -- Make GW understand folders better.
+# PATCH-NEEDS-REBASE bnc-440634-forwarded-hide-accept-decline.patch bnc440634 abharath@suse.de -- Make GW understand folders better. (WAS: PATCH-FIX-SLED)
 Patch53:        bnc-440634-forwarded-hide-accept-decline.patch
 # PATCH-NEEDS-REBASE bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. (was PATCH-FIX-SLED)
 Patch54:        bnc-445996-address-conflict.patch
@@ -109,14 +112,6 @@ License:        LGPLv2.0 ; LGPLv3
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Requires:       evolution = %{version}
-Requires:       evolution-data-server-devel
-Requires:       gconf2-devel
-Requires:       gnome-desktop-devel
-Requires:       gtk2-devel
-Requires:       gtkhtml2-devel
-Requires:       libgnomecanvas-devel
-Requires:       libunique-devel
-Requires:       libxml2-devel
 Provides:       evolution2-devel = %{version}
 Obsoletes:      evolution2-devel < %{version}
 
@@ -124,19 +119,6 @@ Obsoletes:      evolution2-devel < %{version}
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-%package pilot
-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,
-calendar, and addressbook) which should make daily life easier. Because
-of the modular design one can plug new components into Evolution or
-embed the existing ones in other applications.
-
 %package mono-plugins
 License:        LGPLv2.0 ; LGPLv3
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
@@ -181,8 +163,9 @@ gnome-patch-translation-prepare
 %if %USE_EVOLDAP
 %patch15 -p1
 %endif
-%patch16 -p1
+#%patch16 -p1
-%patch18
+# NEEDS REBASE
+#%patch18
 %patch19
 # NEEDS-REBASE
 #%patch23 -p1
@@ -194,11 +177,12 @@ gnome-patch-translation-prepare
 #%patch41 -p1
 # NEEDS-REBASE
 #%patch42 -p1
-%patch53
+# NEEDS REBASE
+#%patch53
 #%patch54
 # NEEDS-REBASE
 #%patch101 -p1
-gnome-patch-translation-update
+#gnome-patch-translation-update
 
 %build
 autoreconf -f -i
@@ -210,17 +194,11 @@ autoreconf -f -i
 %else
     --with-openldap=yes \
 %endif
-    --with-pisock \
-    --enable-pilot-conduits=yes \
-    --with-krb4=%{_prefix} \
     --with-krb5=%{_prefix} \
     --enable-nss=yes \
     --enable-smime=yes \
-    --enable-exchange=yes \
-    --enable-default-binary=yes \
     --enable-mono=yes \
     --enable-python=yes \
-    --enable-icedesktop=no \
     --disable-static
 # Processing the files in help uses _lots_ of memory, so running that part in parallel is bad.
 pushd help
@@ -277,12 +255,13 @@ 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.*
 %{_libdir}/evolution/*/modules/*-module-mail.*
+%{_libdir}/evolution/*/modules/*-module-mailto-handler.*
 %{_libdir}/evolution/*/modules/*-module-plugin-lib.*
+%{_libdir}/evolution/*/modules/*-module-startup-wizard.*
 %{_libdir}/evolution/*/modules/*-module-network-manager.*
 %dir %{_libdir}/evolution/*/plugins
 %{_libdir}/evolution/*/plugins/*-addressbook-file.*
@@ -292,16 +271,15 @@ fi
 %{_libdir}/evolution/*/plugins/*-calendar-http.*
 %{_libdir}/evolution/*/plugins/*-calendar-weather.*
 %{_libdir}/evolution/*/plugins/*-compose-send-options.*
-%{_libdir}/evolution/*/plugins/*-default-mailer.*
 %{_libdir}/evolution/*/plugins/*-default-source.*
 %{_libdir}/evolution/*/plugins/*-email-custom-header.*
 %{_libdir}/evolution/*/plugins/*-evolution-attachment-reminder.*
 %{_libdir}/evolution/*/plugins/*-evolution-bbdb.*
 %{_libdir}/evolution/*/plugins/*-evolution-caldav.*
 %{_libdir}/evolution/*/plugins/*-evolution-google.*
-%{_libdir}/evolution/*/plugins/*-evolution-startup-wizard.*
 %{_libdir}/evolution/*/plugins/*-evolution-webdav.*
 %{_libdir}/evolution/*/plugins/*-gnome-audio-inline.*
+%{_libdir}/evolution/*/plugins/*-gnome-dbx-import.*
 %{_libdir}/evolution/*/plugins/*-gnome-image-inline.*
 %{_libdir}/evolution/*/plugins/*-gnome-vcard-inline.*
 %{_libdir}/evolution/*/plugins/*-groupwise-features.*
@@ -335,12 +313,6 @@ fi
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/eshell
 
-%files pilot
-%defattr(-,root,root)
-%{_datadir}/gnome-pilot/conduits/*.conduit
-%{_libdir}/evolution/*/libeconduit.so.*
-%{_libdir}/evolution/*/conduits
-
 %files mono-plugins
 %defattr(-,root,root)
 %{_libdir}/evolution/*/modules/*-module-plugin-mono.*