Accepting request 637376 from GNOME:Next

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

evolution-3.28.5-dont-expand-archive-folder.patch

@@ -1,162 +0,0 @@
-From dd4cd78c96c7e91d17f7cd9c1d7d220ac8504f3e Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 26 Apr 2018 11:48:47 +0200
-Subject: [PATCH] Bug 795567 - Do not expand archive folder in Copy/Move
- message to folder dialog
-
----
- data/org.gnome.evolution.mail.gschema.xml.in |  4 +
- src/mail/e-mail-reader.c                     |  1 +
- src/mail/em-folder-selector.c                | 98 ++++++++++++++++++++
- src/mail/em-folder-selector.h                |  2 +
- src/modules/mail/e-mail-shell-view-actions.c |  1 +
- 5 files changed, 106 insertions(+)
-
---- a/data/org.gnome.evolution.mail.gschema.xml.in
-+++ b/data/org.gnome.evolution.mail.gschema.xml.in
-@@ -728,6 +728,10 @@
-       <_summary>Visually wrap long lines in composer</_summary>
-       <_description>Whether to visually wrap long lines of text to avoid horizontal scrolling</_description>
-     </key>
-+    <key name="collapse-archive-folders-in-selectors" type="b">
-+      <default>false</default>
-+      <_summary>collapse archive folders in move/copy message to folder and go to folder selectors.</_summary>
-+    </key>
- 
-     <!-- The following keys are deprecated. -->
- 
---- a/src/mail/e-mail-reader.c
-+++ b/src/mail/e-mail-reader.c
-@@ -363,6 +363,7 @@ mail_reader_copy_or_move_selected_messag
- 		EMFT_EXCLUDE_VIRTUAL |
- 		EMFT_EXCLUDE_VTRASH);
- 	gtk_tree_view_expand_all (GTK_TREE_VIEW (folder_tree));
-+	em_folder_selector_maybe_collapse_archive_folders (selector);
- 
- 	if (default_xfer_messages_uri != NULL) {
- 		em_folder_tree_set_selected (
---- a/src/mail/em-folder-selector.c
-+++ b/src/mail/em-folder-selector.c
-@@ -825,3 +825,101 @@ em_folder_selector_new_activity (EMFolde
- 	return activity;
- }
- 
-+void
-+em_folder_selector_maybe_collapse_archive_folders (EMFolderSelector *selector)
-+{
-+	EMFolderTreeModel *model;
-+	EMailSession *mail_session;
-+	ESourceRegistry *registry;
-+	CamelSession *session;
-+	GSettings *settings;
-+	GList *services, *link;
-+	GHashTable *archives;
-+	gchar *local_archive_folder;
-+
-+	g_return_if_fail (EM_IS_FOLDER_SELECTOR (selector));
-+
-+	settings = e_util_ref_settings ("org.gnome.evolution.mail");
-+	if (!g_settings_get_boolean (settings, "collapse-archive-folders-in-selectors")) {
-+		g_object_unref (settings);
-+		return;
-+	}
-+	local_archive_folder = g_settings_get_string (settings, "local-archive-folder");
-+	g_object_unref (settings);
-+
-+	model = em_folder_selector_get_model (selector);
-+	mail_session = em_folder_tree_model_get_session (model);
-+	registry = e_mail_session_get_registry (mail_session);
-+	session = CAMEL_SESSION (mail_session);
-+
-+	archives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-+
-+	if (local_archive_folder && *local_archive_folder) {
-+		g_hash_table_insert (archives, local_archive_folder, NULL);
-+	} else {
-+		g_free (local_archive_folder);
-+	}
-+
-+	services = camel_session_list_services (session);
-+	for (link = services; link; link = g_list_next (link)) {
-+		CamelService *service = link->data;
-+
-+		if (CAMEL_IS_STORE (service)) {
-+			ESource *source;
-+
-+			source = e_source_registry_ref_source (registry, camel_service_get_uid (service));
-+			if (source && e_source_has_extension (source, E_SOURCE_EXTENSION_MAIL_ACCOUNT)) {
-+				ESourceMailAccount *account_ext;
-+				gchar *archive_folder;
-+
-+				account_ext = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_ACCOUNT);
-+
-+				archive_folder = e_source_mail_account_dup_archive_folder (account_ext);
-+				if (archive_folder && *archive_folder) {
-+					g_hash_table_insert (archives, archive_folder, NULL);
-+				} else {
-+					g_free (archive_folder);
-+				}
-+			}
-+
-+			g_clear_object (&source);
-+		}
-+	}
-+
-+	g_list_free_full (services, g_object_unref);
-+
-+	if (g_hash_table_size (archives)) {
-+		GtkTreeView *tree_view;
-+		GHashTableIter iter;
-+		gpointer key;
-+
-+		tree_view = GTK_TREE_VIEW (em_folder_selector_get_folder_tree (selector));
-+
-+		g_hash_table_iter_init (&iter, archives);
-+
-+		while (g_hash_table_iter_next (&iter, &key, NULL)) {
-+			const gchar *folder_uri = key;
-+			CamelStore *store = NULL;
-+			gchar *folder_name = NULL;
-+
-+			if (folder_uri && *folder_uri &&
-+			    e_mail_folder_uri_parse (session, folder_uri, &store, &folder_name, NULL)) {
-+				GtkTreeRowReference *row;
-+
-+				row = em_folder_tree_model_get_row_reference (model, store, folder_name);
-+				if (row) {
-+					GtkTreePath *path;
-+
-+					path = gtk_tree_row_reference_get_path (row);
-+					gtk_tree_view_collapse_row (tree_view, path);
-+					gtk_tree_path_free (path);
-+				}
-+
-+				g_clear_object (&store);
-+				g_free (folder_name);
-+			}
-+		}
-+	}
-+
-+	g_hash_table_destroy (archives);
-+}
---- a/src/mail/em-folder-selector.h
-+++ b/src/mail/em-folder-selector.h
-@@ -96,6 +96,8 @@ void		em_folder_selector_set_selected	(E
- const gchar *	em_folder_selector_get_selected_uri
- 						(EMFolderSelector *selector);
- EActivity *	em_folder_selector_new_activity	(EMFolderSelector *selector);
-+void		em_folder_selector_maybe_collapse_archive_folders
-+						(EMFolderSelector *selector);
- 
- G_END_DECLS
- 
---- a/src/modules/mail/e-mail-shell-view-actions.c
-+++ b/src/modules/mail/e-mail-shell-view-actions.c
-@@ -1145,6 +1145,7 @@ action_mail_goto_folder_cb (GtkAction *a
- 
- 	folder_tree = em_folder_selector_get_folder_tree (selector);
- 	gtk_tree_view_expand_all (GTK_TREE_VIEW (folder_tree));
-+	em_folder_selector_maybe_collapse_archive_folders (selector);
- 
- 	if (folder) {
- 		gchar *uri = e_mail_folder_uri_from_folder (folder);

evolution-3.28.5.tar.xz

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

evolution-3.30.0.tar.xz

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

evolution.changes

@@ -1,9 +1,179 @@
+-------------------------------------------------------------------
+Tue Sep 18 03:10:31 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.30.0:
+  + Miscellaneous: Help: Couple of fixes for Gmail POP/IMAP. 
+  + Updated translations.
+- Update spec:
+  + Add cairo-gobject, camel-1.2, gnome-autoar-0,
+    gsettings-desktop-schemas, enchant, libebackend-1.2, libebook-\
+    1.2, libecal-1.2, and libedataserverui-1.2 pkgconfig modules to
+    main package build requirements to avoid implicit dependencies.
+  + Add missing dependencies for devel package: evolution-data-\
+    server devel package, enchant, gtk+-3.0, gtkspell3-3.0,
+    gweather-3.0, libgdata, libsoup-2.4 and libxml-2.0 pkgconfig
+    modules BuildRequires.
+  + Drop pangoft2 and sm pkgconfig modules BuildRequires: they are
+    no longer needed nor used.
+  + Drop lang subpackage Recommends: the main package is already
+    being supplemented by the lang subpackage due to RPM automatic
+    setting.
+
+-------------------------------------------------------------------
+Wed Aug 29 00:45:09 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.92:
+  + Correct build when nss/nspr do not provide pkg-config files.
+  + Crash under config_lookup_thread() at e-config-lookup.c:179.
+  + [EMailRequest] mail:// URI can be without additional arguments.
+  + Help: Link to Evolution project on GNOME Gitlab instead of
+    frontpage.
+  + Bugs fxed: glgo#GNOME/evolution!83,
+    glgo#GNOME/evolution-data-server!82, and
+    glgo#GNOME/evolution!47. 
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Aug 13 18:40:12 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.91:
+  + docs: Use http for w3.org URLs so gettext parsing itstool tags
+    doesn't choke.
+  + Add a translator comment to "Archive".
+  + Replace Bugzilla by Gitlab in user-visible error messages.
+  + Use the fancy Unicode apostrophes in new strings.
+  + Updated translations.
+- Drop evolution-3.28.5-dont-expand-archive-folder.patch: Fixed
+  upstream.
+
 -------------------------------------------------------------------
 Thu Aug  9 22:56:27 UTC 2018 - mcepl@suse.com
 
 - Add evolution-3.28.5-dont-expand-archive-folder.patch
   (bgo#795567).
 
+-------------------------------------------------------------------
+Wed Aug  1 21:59:07 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.90:
+  + [mail-notification] Correct a recently added translatable
+    string.
+  + Highlight of the search bar entry doesn't work.
+  + Fix two possible memory leaks related to message composer.
+  + Update some of the editor unit tests to not fail.
+  + Propagate trust prompt response within collection sources.
+  + Unnecessary message parse when viewing message source.
+  + Print of message source doesn't print message source.
+  + Help:
+    - Remove comment about Buteo (those links are dead).
+    - Use https URL for syncevolution link.
+    - Use https URL for IETF RFC links.
+    - Replace GNOME Bugzilla by GNOME Gitlab link to report bugs.
+    - Use https URL for GNOME FTP link.
+    - Use https URL for freedesktop.org spec.
+    - Cover mail label item added to main menu in bgo#269852.
+    - Add a TODO item.
+  + Bugs fixed: bgo#787344, bgo#788370,bgo#269852, bgo#241477,
+    bgo#240905, bgo#227703, glgo#GNOME/evolution#75,
+    glgo#GNOME/evolution#71, glgo#GNOME/evolution#78,
+    glgo#GNOME/evolution#57, glgo#GNOME/evolution#46,
+    glgo#GNOME/evolution#80.
+  + Updated translations.
+- Drop adwaita-icon-theme BuildRequires: No longer needed.
+
+-------------------------------------------------------------------
+Wed Aug  1 03:29:04 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.29.4:
+  + Miscellaneous:
+    - Make it possible to disable text-highlight module with a
+      GSettings option;
+    - Try also with the From address when looking up correct From
+      account for composer;
+    - Properly wrap text in 'Security Information' dialog;
+    - Add 4px bottom margin to secure button table;
+    - [Composer] Message generated twice when using 'Send through
+      Outbox';
+    - Fix a few memory leaks.
+  + Bugs fixed: bgo#704246, bgo#757504, bgo#548681, bgo#750636,
+    bgo#770141, bgo#723590, bgo#794085, bgo#786747,
+    glgo#GNOME/evolution#25, glgo#GNOME/evolution#31,
+    glgo#GNOME/evolution#32, glgo#GNOME/evolution#37,
+    glgo#GNOME/evolution#43, glgo#GNOME/evolution#44,
+    glgo#GNOME/evolution#67, glgo#GNOME/evolution#39,
+    glgo#GNOME/evolution#55, glgo#GNOME/evolution#53,
+    glgo#GNOME/evolution#69, glgo#GNOME/evolution-data-server#13,
+    glgo#GNOME/evolution-data-server#3.
+  + Updated help.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Aug  1 03:29:03 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.3:
+  + [mail-send-recv] Remove unused struct
+    _send_info::keep_on_server property.
+  + Update bug URL and switch to https:// in the DOAP file.
+  + Fix a possible memory leak in mail_display_uri_requested_cb().
+  + [composer-autosave] Use-after-free during snapshot save to
+    file ][.
+  + Fix few memory leaks around camel_data_wrapper_get_mime_type().
+  + Try to preselect source type when creating new source.
+  + Missing build dependency for gdbus-codegen on input .xml file.
+  + Compare only date when searching with Sent/Received dates.
+  + [ENameSelectorEntry] Plain text drag & drop between entries
+    misbehaves.
+  + Use 'User-Agent' instead of 'X-Mailer' header when sending
+    message.
+  + Mail Accounts in Preferences not always properly sorted.
+  + Drop dependency on libcryptui
+  + Bugs fixed: bgo#796155, bgo#796294, bgo#795870, bgo#795869,
+    bgo#776162, bgo#796174, glgo#GNOME/evolution#9,
+    glgo#GNOME/evolution#14, glgo#GNOME/evolution#20,
+    glgo#GNOME/evolution#19.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Aug  1 03:29:02 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.29.2:
+  + Miscellaneous:
+    - Crash when making links clickable in composer;
+    - Shift+Click on switcher button to open a new window.
+  + Bugs fixed: bgo#795289, bgo#795331, bgo#795447, bgo#795567,
+    bgo#795977, bgo#796114.
+  + Updated translations.
+- Changes from version 3.29.1:
+  + Miscellaneous:
+    - Show 8 days in the To Do bar;
+    - Make it possible to disable Reminders for Tasks;
+    - Reply includes HTML attachment in message body;
+    - [EMailDisplay] Do not call reload when nothing is loaded;
+    - Make list of headers for message preview reorderable in
+      Preferences;
+    - [EToDoPane] With completed hide also cancelled tasks;
+    - Classification UI in task/cal editor is not consistent
+      anymore;
+    - No globe button anymore, just a 'Select' button;
+    - Cover how to set objects as private by default.
+  + Bugs fixed: bgo#788193, bgo#793915, bgo#602612, bgo#794204,
+    bgo#200907, bgo#516943, bgo#794465, bgo#764044, bgo#794832,
+    bgo#793583, bgo#724647, bgo#795106, bgo#795108.
+  + Updated translations.
+- Drop:
+  + glib2_gsettings_schema_requires: it is no longer needed since
+    RPM file triggers.
+  + gnome-common and pkgconfig(gtkimageview-3.0) BuildRequires:
+    they are no longer required nor even used.
+  + evolution-autoArchive-archives-Junk-and-Deleted-too.patch:
+    fixed upstream.
+  + pkgconfig(libnotify) BuildRequires to follow upstream move of
+    alarm-notify to evolution-data-server.
+  + evolution-alarm-notify-do-not-use-markup.patch: fixed upstream.
+- Add OLDAP-2.8, CC-BY-SA-3.0, GFDL-1.1-only and GFDL-1.3-only to
+  the License tag to comply with the due copyrights of some source
+  files exceptions that are not under LGPLv2(3).
+
 -------------------------------------------------------------------
 Tue Jul 31 06:27:24 UTC 2018 - bjorn.lie@gmail.com
 

evolution.spec

@@ -16,28 +16,19 @@
 #
 
 
-# wait for port of gtkimageview to gtk3
-%define use_gtkimageview 0
-%define need_autogen 0
-# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
-%define evolution_base_version 3.28
 # _version needs to be %{version} stripped to major.minor.micro only...
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
 Name:           evolution
-Version:        3.28.5
+Version:        3.30.0
 Release:        0
 # FIXME: check if note on license is still valid (comment before license)
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
-License:        LGPL-2.0-only AND LGPL-3.0-only
+License:        LGPL-2.0-only AND LGPL-3.0-only AND OLDAP-2.8 AND CC-BY-SA-3.0 AND GFDL-1.1-only AND GFDL-1.3-only
 Group:          Productivity/Networking/Email/Clients
-URL:            http://wiki.gnome.org/Apps/Evolution/
+URL:            https://wiki.gnome.org/Apps/Evolution/
-Source0:        http://download.gnome.org/sources/evolution/%{evolution_base_version}/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/evolution/3.30/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM evolution-3.28.5-dont-expand-archive-folder.patch mcepl@suse.cz -- Do not expand archive folder in Copy/Move message to folder dialog (bgo#795567)
-Patch0:         evolution-3.28.5-dont-expand-archive-folder.patch
 
-# The icon we rely on is from adwaita-icon-theme
-BuildRequires:  adwaita-icon-theme
 BuildRequires:  bison
 BuildRequires:  bogofilter
 BuildRequires:  cmake
@@ -58,43 +49,50 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(cairo-gobject)
+BuildRequires:  pkgconfig(camel-1.2) >= %{_version}
+BuildRequires:  pkgconfig(enchant)
 BuildRequires:  pkgconfig(gail-3.0) >= 3.2.0
 BuildRequires:  pkgconfig(gcr-3) >= 3.4
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.24.0
 BuildRequires:  pkgconfig(geocode-glib-1.0) >= 3.10
 BuildRequires:  pkgconfig(gio-2.0) >= 2.40.0
 BuildRequires:  pkgconfig(gladeui-2.0) >= 3.10.0
+BuildRequires:  pkgconfig(gmodule-2.0) >= 2.40.0
+BuildRequires:  pkgconfig(gnome-autoar-0) >= 0.1.1
 BuildRequires:  pkgconfig(gnome-autoar-gtk-0) >= 0.1.1
 BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 2.91.3
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+# NOTE when bumping this BR, bump the req in devel pac below
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.8.0
+# /NOTE
 BuildRequires:  pkgconfig(gtkspell3-3.0)
+# NOTE when bumping this BR, bump the req in devel pac below
 BuildRequires:  pkgconfig(gweather-3.0) >= 3.10
+# /NOTE
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
+BuildRequires:  pkgconfig(libebackend-1.2) >= %{_version}
+BuildRequires:  pkgconfig(libebook-1.2) >= %{_version}
+BuildRequires:  pkgconfig(libecal-1.2) >= %{_version}
 BuildRequires:  pkgconfig(libedataserver-1.2) >= %{_version}
+BuildRequires:  pkgconfig(libedataserverui-1.2) >= %{_version}
+# NOTE when bumping this BR, bump the req in devel pac below
 BuildRequires:  pkgconfig(libgdata) >= 0.10
-BuildRequires:  pkgconfig(libnotify) >= 0.7
+# /NOTE
 BuildRequires:  pkgconfig(libpst) >= 0.6.54
+# NOTE when bumping this BR, bump the req in devel pac below
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42
+# /NOTE
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.7.3
 BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
-BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(shared-mime-info) >= 0.22
-BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.13.90
 Requires:       evolution-data-server >= %{_version}
-Recommends:     %{name}-lang
 # Mono and python plugins were available until evo 3.5.x
 Obsoletes:      evolution-mono-plugins < %{version}
 Obsoletes:      evolution-python-plugins < %{version}
-%glib2_gsettings_schema_requires
-%if %{need_autogen}
-BuildRequires:  gnome-common
-%endif
-%if %{use_gtkimageview}
-BuildRequires:  pkgconfig(gtkimageview-3.0)
-%endif
 
 %description
 Evolution consists of modular components (at the moment: mailer,
@@ -153,6 +151,14 @@ Adds support for junk-mail filtering via spamassassin.
 Summary:        Development files for the Evolution groupware suite
 Group:          Development/Libraries/C and C++
 Requires:       evolution = %{version}
+Requires:       evolution-data-server-devel = %{version}
+Requires:       pkgconfig(enchant)
+Requires:       pkgconfig(gtk+-3.0) >= 3.8.0
+Requires:       pkgconfig(gtkspell3-3.0)
+Requires:       pkgconfig(gweather-3.0) >= 3.10
+Requires:       pkgconfig(libgdata) >= 0.10
+Requires:       pkgconfig(libsoup-2.4) >= 2.42
+Requires:       pkgconfig(libxml-2.0)
 Provides:       evolution2-devel = %{version}
 Obsoletes:      evolution2-devel < %{version}
 
@@ -172,24 +178,18 @@ translation-update-upstream
   -DENABLE_YTNEF=OFF \
   -DWITH_GLADE_CATALOG=ON \
   -DENABLE_GTK_DOC=ON \
-  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_RPATH=OFF
-%if !%{use_gtkimageview}
-  %{nil}
-%endif
-  %{nil}
 make %{?_smp_mflags}
 
 %install
 %cmake_install
 %suse_update_desktop_file -r -G "Mail and Calendar" org.gnome.Evolution GNOME GTK Network Email Calendar ContactManagement
-%suse_update_desktop_file org.gnome.Evolution-alarm-notify
 %find_lang %{name} %{?no_lang_C}
-#%%find_lang evolution %%{?no_lang_C} evolution-%%evolution_base_version.lang
 %fdupes %{buildroot}/%{_prefix}
 
 %files
-%license COPYING
+%license COPYING COPYING-DOCS COPYING-DOCS.CCBYSA COPYING-DOCS.GFDL
-%doc AUTHORS COPYING-DOCS COPYING-DOCS.CCBYSA COPYING-DOCS.GFDL NEWS NEWS-1.0
+%doc AUTHORS NEWS
 %doc %{_datadir}/help/C/%{name}/
 %{_bindir}/*
 %{_datadir}/GConf/gsettings/evolution.convert
@@ -211,10 +211,10 @@ make %{?_smp_mflags}
 %dir %{_libdir}/evolution/modules
 %{_libdir}/evolution/modules/module-addressbook.so
 %{_libdir}/evolution/modules/module-backup-restore.so
+%{_libdir}/evolution/modules/module-book-config-carddav.so
 %{_libdir}/evolution/modules/module-book-config-google.so
 %{_libdir}/evolution/modules/module-book-config-ldap.so
 %{_libdir}/evolution/modules/module-book-config-local.so
-%{_libdir}/evolution/modules/module-book-config-webdav.so
 %{_libdir}/evolution/modules/module-cal-config-caldav.so
 %{_libdir}/evolution/modules/module-cal-config-contacts.so
 %{_libdir}/evolution/modules/module-cal-config-google.so
@@ -261,9 +261,6 @@ make %{?_smp_mflags}
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
 %{_libdir}/evolution/plugins/liborg-gnome-external-editor.so
 %{_libdir}/evolution/plugins/org-gnome-external-editor.eplug
-%if %{use_gtkimageview}
-%{_libdir}/evolution/plugins/*-gnome-image-inline.*
-%endif
 %{_libdir}/evolution/plugins/*-mailing-list-actions.*
 %{_libdir}/evolution/plugins/*-mail-notification.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
@@ -275,7 +272,6 @@ make %{?_smp_mflags}
 %{_libdir}/evolution/plugins/*-templates.*
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 %dir %{_libexecdir}/evolution
-%{_libexecdir}/evolution/evolution-alarm-notify
 %{_libexecdir}/evolution/evolution-backup
 %{_libexecdir}/evolution/killev
 %dir %{_libdir}/evolution/web-extensions
@@ -283,9 +279,8 @@ make %{?_smp_mflags}
 %{_libdir}/evolution/web-extensions/module-itip-formatter-webextension.so
 %dir %{_libdir}/evolution/web-extensions/webkit-editor
 %{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
-%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
+%dir %{_libdir}/evolution-data-server/ui-modules
-
+%{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
-%files lang -f evolution.lang
 
 %files -n glade-catalog-evolution
 %{_libdir}/glade/modules/libgladeevolution.so
@@ -304,7 +299,7 @@ make %{?_smp_mflags}
 %{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml
 
 %files devel
-%doc ChangeLog HACKING MAINTAINERS README
+%doc ChangeLog HACKING MAINTAINERS NEWS-1.0 README
 %doc %{_datadir}/gtk-doc/html/evolution-*/
 %{_includedir}/evolution*
 %{_libdir}/pkgconfig/evolution-calendar-3.0.pc
@@ -312,4 +307,6 @@ make %{?_smp_mflags}
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
 
+%files lang -f evolution.lang
+
 %changelog