Update to 3.16.0

- removed obsolete -gnome-icon-theme.patch

diff --git a/evolution-gnome-icon-theme.patch b/evolution-gnome-icon-theme.patch
deleted file mode 100644 (file)
index 50f9612..0000000
--- a/evolution-gnome-icon-theme.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- evolution-3.12.6/configure.ac~     2014-08-11 10:01:25.000000000 +0200
-+++ evolution-3.12.6/configure.ac      2014-10-11 19:26:18.574504603 +0200
-@@ -505,25 +505,6 @@
- AC_CHECK_FUNCS(mkdtemp)
- 
- dnl **************************************************
--dnl Gnome Icon Theme
--dnl **************************************************
--AC_MSG_CHECKING(for icon theme)
--PKG_CHECK_EXISTS([gnome-icon-theme >= gnome_icon_theme_minimum_version],
--               have_icon_theme=yes, have_icon_theme=no)
--if test "x$have_icon_theme" != "xyes"; then
--      PKG_CHECK_EXISTS([adwaita-icon-theme],
--               have_icon_theme=yes, have_icon_theme=no)
--fi
--
--if test "x$have_icon_theme" != "xyes"; then
--   AC_MSG_RESULT(no)
--   AC_MSG_FAILURE([You need to have gnome-icon-theme or adwaita-icon-theme installed.])
--else
--   AC_MSG_RESULT(yes)
--fi
--
--
--dnl **************************************************
- dnl Accessibility support
- dnl **************************************************
- PKG_CHECK_MODULES([A11Y], [atk])

diff --git a/evolution.spec b/evolution.spec
index 01fb8b61b29e9d68c2ec49b4cb1ed61b371000d9..00be2548d0d56d7b39ad3280a4e0a92b6dd8e627 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,28 +1,24 @@
-# TODO: image-inline (requires gtk+3 based gtkimageview, not released yet)
-#
 # Conditional build:
 %bcond_without ldap            # LDAP support
 %bcond_without contact_maps    # contact maps (libchamplain+clutter+geocode)
 %bcond_without glade           # Glade catalog
 
-%define                basever 3.12
 Summary:       The GNOME Email/Calendar/Addressbook Suite
 Summary(pl.UTF-8):     Klient poczty, kalendarz i książka adresowa dla GNOME
 Summary(pt_BR.UTF-8):  Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN.UTF-8):  Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄)
 Name:          evolution
-Version:       3.12.11
-Release:       2
+Version:       3.16.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Mail
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution/3.12/%{name}-%{version}.tar.xz
-# Source0-md5: 22ceaebe4add813e15253a76939af7f0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution/3.16/%{name}-%{version}.tar.xz
+# Source0-md5: 21f7a5c78af4b10dcfb469efcb18b901
 Source3:       %{name}-addressbook.desktop
 Source4:       %{name}-calendar.desktop
 Source5:       %{name}-mail.desktop
 Source6:       %{name}-tasks.desktop
 Patch0:                %{name}-nolibs.patch
-Patch1:                %{name}-gnome-icon-theme.patch
 URL:           http://wiki.gnome.org/Apps/Evolution/
 BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.64
@@ -38,20 +34,20 @@ BuildRequires:      geoclue-devel >= 0.12.0
 BuildRequires: gettext-tools >= 0.18.1
 BuildRequires: gdk-pixbuf2-devel >= 2.24.0
 %{?with_glade:BuildRequires:   glade-devel >= 3.10.0}
-BuildRequires: glib2-devel >= 1:2.36.0
+BuildRequires: glib2-devel >= 1:2.40.0
 BuildRequires: gnome-common >= 2.26.0
 BuildRequires: gnome-desktop-devel >= 3.2.0
-BuildRequires: gnome-icon-theme >= 3.2.0
 BuildRequires: gsettings-desktop-schemas-devel >= 3.2.0
 BuildRequires: gstreamer-devel
-BuildRequires: gtk+3-devel >= 3.8.0
+BuildRequires: gtk+3-devel >= 3.10.0
 BuildRequires: gtk-doc >= 1.14
-BuildRequires: gtk-webkit3-devel >= 2.0.1
+BuildRequires: gtk-webkit3-devel >= 2.2.0
 BuildRequires: gtkhtml-devel >= 4.5.2
 BuildRequires: gtkspell3-devel >= 3.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libcanberra-gtk3-devel >= 0.25
 %{?with_contact_maps:BuildRequires:    libchamplain-devel >= 0.12}
+BuildRequires: libcryptui-devel
 BuildRequires: libgdata-devel >= 0.10
 BuildRequires: libgweather-devel >= 3.8.0
 BuildRequires: libical-devel
@@ -78,7 +74,7 @@ BuildRequires:        xorg-lib-libSM-devel
 BuildRequires: xorg-proto-xproto-devel
 BuildRequires: xz
 BuildRequires: yelp-tools
-Requires(post,postun): glib2 >= 1:2.36.0
+Requires(post,postun): glib2 >= 1:2.40.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): scrollkeeper
 Requires:      %{name}-component = %{version}-%{release}
@@ -101,7 +97,7 @@ Obsoletes:   gnome-pim
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                evo_plugins_dir         %{_libdir}/evolution/%{basever}/plugins
+%define                evo_plugins_dir         %{_libdir}/evolution/plugins
 
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
@@ -123,9 +119,9 @@ Summary(pl.UTF-8):  Biblioteki Evolution
 Group:         X11/Libraries
 Requires:      gcr >= 3.4
 Requires:      gdk-pixbuf2 >= 2.24.0
-Requires:      glib2 >= 1:2.36.0
-Requires:      gtk+3 >= 3.8.0
-Requires:      gtk-webkit3 >= 2.0.1
+Requires:      glib2 >= 1:2.40.0
+Requires:      gtk+3 >= 3.10.0
+Requires:      gtk-webkit3 >= 2.2.0
 Requires:      gtkhtml >= 4.5.2
 Requires:      libcanberra-gtk3 >= 0.25
 Requires:      libsoup >= 2.42.0
@@ -146,10 +142,10 @@ Group:            X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cyrus-sasl-devel
 Requires:      evolution-data-server-devel >= %{version}
-Requires:      glib2-devel >= 1:2.36.0
+Requires:      glib2-devel >= 1:2.40.0
 Requires:      gnome-desktop-devel >= 3.2.0
-Requires:      gtk+3-devel >= 3.8.0
-Requires:      gtk-webkit3-devel >= 2.0.1
+Requires:      gtk+3-devel >= 3.10.0
+Requires:      gtk-webkit3-devel >= 2.2.0
 Requires:      gtkhtml-devel >= 4.5.3
 Requires:      libxml2-devel >= 1:2.7.3
 %{?with_ldap:Requires: openldap-devel >= 2.4.6}
@@ -203,7 +199,7 @@ Summary:    Evolution mail component
 Summary(pl.UTF-8):     Moduł pocztowy Evolution
 Group:         X11/Applications/Mail
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.36.0
+Requires(post,postun): glib2 >= 1:2.40.0
 # mail composer requires addressbook component
 Requires:      %{name}-addressbook = %{version}-%{release}
 Requires:      libpst >= 0.6.54
@@ -220,7 +216,7 @@ Summary:    Evolution addressbook component
 Summary(pl.UTF-8):     Moduł książki adresowej Evolution
 Group:         X11/Applications/Mail
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.36.0
+Requires(post,postun): glib2 >= 1:2.40.0
 Requires:      %{name} = %{version}-%{release}
 %{?with_contact_maps:Requires: clutter-gtk >= 0.90}
 %{?with_contact_maps:Requires: geocode-glib >= 3.10.0}
@@ -238,7 +234,7 @@ Summary:    Evolution calendar and todo component
 Summary(pl.UTF-8):     Moduł kalendarza i listy zadań Evolution
 Group:         X11/Applications
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.36.0
+Requires(post,postun): glib2 >= 1:2.40.0
 Requires:      %{name} = %{version}-%{release}
 Requires:      libgdata >= 0.10
 Requires:      libgweather >= 3.8.0
@@ -270,7 +266,6 @@ Dokumentacja API Evolution.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -291,11 +286,11 @@ Dokumentacja API Evolution.
        --enable-canberra \
        %{?with_contact_maps:--enable-contact-maps} \
        --enable-gtk-doc \
-       --disable-image-inline \
        --enable-nss \
        %{__with_without ldap openldap} \
        --enable-plugins=all \
        --enable-pst-import \
+       --disable-autoar \
        --disable-silent-rules \
        --enable-smime \
        --enable-static \
@@ -320,8 +315,8 @@ rm -rf $RPM_BUILD_ROOT
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
 
 # remove useless files
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/%{basever}/{modules,plugins}/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/%{basever}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/{modules,plugins}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/*.la
 %if %{with glade}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladeevolution.{la,a}
 %endif
@@ -371,17 +366,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS* README
 %attr(755,root,root) %{_bindir}/evolution
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-alarm-notify
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/killev
-%dir %{_libdir}/evolution/%{basever}/modules
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-composer-autosave.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-contact-photos.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-gravatar.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-offline-alert.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-plugin-lib.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-plugin-manager.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-settings.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-web-inspector.so
+%attr(755,root,root) %{_libdir}/evolution/evolution-alarm-notify
+%attr(755,root,root) %{_libdir}/evolution/killev
+%dir %{_libdir}/evolution/modules
+%attr(755,root,root) %{_libdir}/evolution/modules/module-composer-autosave.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-contact-photos.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-gravatar.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-offline-alert.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-plugin-lib.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-plugin-manager.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-settings.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-web-inspector.so
 
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
@@ -391,90 +386,89 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/appdata/evolution.appdata.xml
 
 %dir %{_datadir}/evolution
-%dir %{_datadir}/evolution/%{basever}
-%dir %{_datadir}/evolution/%{basever}/default
-%dir %{_datadir}/evolution/%{basever}/default/C
-%dir %{_datadir}/evolution/%{basever}/etspec
-%dir %{_datadir}/evolution/%{basever}/views
-
-%lang(ca) %dir %{_datadir}/evolution/%{basever}/default/ca
-%lang(cs) %dir %{_datadir}/evolution/%{basever}/default/cs
-%lang(de) %dir %{_datadir}/evolution/%{basever}/default/de
-%lang(es) %dir %{_datadir}/evolution/%{basever}/default/es
-%lang(fi) %dir %{_datadir}/evolution/%{basever}/default/fi
-%lang(fr) %dir %{_datadir}/evolution/%{basever}/default/fr
-%lang(hu) %dir %{_datadir}/evolution/%{basever}/default/hu
-%lang(id) %dir %{_datadir}/evolution/%{basever}/default/id
-%lang(it) %dir %{_datadir}/evolution/%{basever}/default/it
-%lang(ja) %dir %{_datadir}/evolution/%{basever}/default/ja
-%lang(ko) %dir %{_datadir}/evolution/%{basever}/default/ko
-%lang(lt) %dir %{_datadir}/evolution/%{basever}/default/lt
-%lang(mk) %dir %{_datadir}/evolution/%{basever}/default/mk
-%lang(nl) %dir %{_datadir}/evolution/%{basever}/default/nl
-%lang(pl) %dir %{_datadir}/evolution/%{basever}/default/pl
-%lang(pt) %dir %{_datadir}/evolution/%{basever}/default/pt
-%lang(ro) %dir %{_datadir}/evolution/%{basever}/default/ro
-%lang(sv) %dir %{_datadir}/evolution/%{basever}/default/sv
-%lang(sr) %dir %{_datadir}/evolution/%{basever}/default/sr
-%lang(sr@latin) %dir %{_datadir}/evolution/%{basever}/default/sr@latin
-%lang(zh_CN) %dir %{_datadir}/evolution/%{basever}/default/zh_CN
-
-%{_datadir}/evolution/%{basever}/address_formats.dat
-%{_datadir}/evolution/%{basever}/countrytransl.map
-
-%dir %{_datadir}/evolution/%{basever}/errors
-%{_datadir}/evolution/%{basever}/errors/e-system.error
-%{_datadir}/evolution/%{basever}/errors/filter.error
-%{_datadir}/evolution/%{basever}/errors/mail-composer.error
-%{_datadir}/evolution/%{basever}/errors/shell.error
-%{_datadir}/evolution/%{basever}/errors/evolution-offline-alert.error
-%{_datadir}/evolution/%{basever}/errors/widgets.error
-
-%dir %{_datadir}/evolution/%{basever}/help
-%dir %{_datadir}/evolution/%{basever}/help/quickref
-%dir %{_datadir}/evolution/%{basever}/help/quickref/C
-
-%{_datadir}/evolution/%{basever}/help/quickref/C/quickref.pdf
-%lang(ca) %dir %{_datadir}/evolution/%{basever}/help/quickref/ca
-%lang(ca) %{_datadir}/evolution/%{basever}/help/quickref/ca/quickref.pdf
-%lang(cs) %dir %{_datadir}/evolution/%{basever}/help/quickref/cs
-%lang(cs) %{_datadir}/evolution/%{basever}/help/quickref/cs/quickref.pdf
-%lang(de) %dir %{_datadir}/evolution/%{basever}/help/quickref/de
-%lang(de) %{_datadir}/evolution/%{basever}/help/quickref/de/quickref.pdf
-%lang(es) %dir %{_datadir}/evolution/%{basever}/help/quickref/es
-%lang(es) %{_datadir}/evolution/%{basever}/help/quickref/es/quickref.pdf
-%lang(fr) %dir %{_datadir}/evolution/%{basever}/help/quickref/fr
-%lang(fr) %{_datadir}/evolution/%{basever}/help/quickref/fr/quickref.pdf
-%lang(hu) %dir %{_datadir}/evolution/%{basever}/help/quickref/hu
-%lang(hu) %{_datadir}/evolution/%{basever}/help/quickref/hu/quickref.pdf
-%lang(it) %dir %{_datadir}/evolution/%{basever}/help/quickref/it
-%lang(it) %{_datadir}/evolution/%{basever}/help/quickref/it/quickref.pdf
-%lang(pl) %dir %{_datadir}/evolution/%{basever}/help/quickref/pl
-%lang(pl) %{_datadir}/evolution/%{basever}/help/quickref/pl/quickref.pdf
-%lang(pt) %dir %{_datadir}/evolution/%{basever}/help/quickref/pt
-%lang(pt) %{_datadir}/evolution/%{basever}/help/quickref/pt/quickref.pdf
-%lang(sq) %dir %{_datadir}/evolution/%{basever}/help/quickref/sq
-%lang(sq) %{_datadir}/evolution/%{basever}/help/quickref/sq/quickref.pdf
-%lang(sv) %dir %{_datadir}/evolution/%{basever}/help/quickref/sv
-%lang(sv) %{_datadir}/evolution/%{basever}/help/quickref/sv/quickref.pdf
-
-%{_datadir}/evolution/%{basever}/icons
-%{_datadir}/evolution/%{basever}/images
-%{_datadir}/evolution/%{basever}/sounds
-%{_datadir}/evolution/%{basever}/theme
-%{_datadir}/evolution/%{basever}/ui
+%dir %{_datadir}/evolution/default
+%dir %{_datadir}/evolution/default/C
+%dir %{_datadir}/evolution/etspec
+%dir %{_datadir}/evolution/views
+
+%lang(ca) %dir %{_datadir}/evolution/default/ca
+%lang(cs) %dir %{_datadir}/evolution/default/cs
+%lang(de) %dir %{_datadir}/evolution/default/de
+%lang(es) %dir %{_datadir}/evolution/default/es
+%lang(fi) %dir %{_datadir}/evolution/default/fi
+%lang(fr) %dir %{_datadir}/evolution/default/fr
+%lang(hu) %dir %{_datadir}/evolution/default/hu
+%lang(id) %dir %{_datadir}/evolution/default/id
+%lang(it) %dir %{_datadir}/evolution/default/it
+%lang(ja) %dir %{_datadir}/evolution/default/ja
+%lang(ko) %dir %{_datadir}/evolution/default/ko
+%lang(lt) %dir %{_datadir}/evolution/default/lt
+%lang(mk) %dir %{_datadir}/evolution/default/mk
+%lang(nl) %dir %{_datadir}/evolution/default/nl
+%lang(pl) %dir %{_datadir}/evolution/default/pl
+%lang(pt) %dir %{_datadir}/evolution/default/pt
+%lang(ro) %dir %{_datadir}/evolution/default/ro
+%lang(sv) %dir %{_datadir}/evolution/default/sv
+%lang(sr) %dir %{_datadir}/evolution/default/sr
+%lang(sr@latin) %dir %{_datadir}/evolution/default/sr@latin
+%lang(zh_CN) %dir %{_datadir}/evolution/default/zh_CN
+
+%{_datadir}/evolution/address_formats.dat
+%{_datadir}/evolution/countrytransl.map
+
+%dir %{_datadir}/evolution/errors
+%{_datadir}/evolution/errors/e-system.error
+%{_datadir}/evolution/errors/filter.error
+%{_datadir}/evolution/errors/mail-composer.error
+%{_datadir}/evolution/errors/shell.error
+%{_datadir}/evolution/errors/evolution-offline-alert.error
+%{_datadir}/evolution/errors/widgets.error
+
+%dir %{_datadir}/evolution/help
+%dir %{_datadir}/evolution/help/quickref
+%dir %{_datadir}/evolution/help/quickref/C
+
+%{_datadir}/evolution/help/quickref/C/quickref.pdf
+%lang(ca) %dir %{_datadir}/evolution/help/quickref/ca
+%lang(ca) %{_datadir}/evolution/help/quickref/ca/quickref.pdf
+%lang(cs) %dir %{_datadir}/evolution/help/quickref/cs
+%lang(cs) %{_datadir}/evolution/help/quickref/cs/quickref.pdf
+%lang(de) %dir %{_datadir}/evolution/help/quickref/de
+%lang(de) %{_datadir}/evolution/help/quickref/de/quickref.pdf
+%lang(es) %dir %{_datadir}/evolution/help/quickref/es
+%lang(es) %{_datadir}/evolution/help/quickref/es/quickref.pdf
+%lang(fr) %dir %{_datadir}/evolution/help/quickref/fr
+%lang(fr) %{_datadir}/evolution/help/quickref/fr/quickref.pdf
+%lang(hu) %dir %{_datadir}/evolution/help/quickref/hu
+%lang(hu) %{_datadir}/evolution/help/quickref/hu/quickref.pdf
+%lang(it) %dir %{_datadir}/evolution/help/quickref/it
+%lang(it) %{_datadir}/evolution/help/quickref/it/quickref.pdf
+%lang(pl) %dir %{_datadir}/evolution/help/quickref/pl
+%lang(pl) %{_datadir}/evolution/help/quickref/pl/quickref.pdf
+%lang(pt) %dir %{_datadir}/evolution/help/quickref/pt
+%lang(pt) %{_datadir}/evolution/help/quickref/pt/quickref.pdf
+%lang(sq) %dir %{_datadir}/evolution/help/quickref/sq
+%lang(sq) %{_datadir}/evolution/help/quickref/sq/quickref.pdf
+%lang(sv) %dir %{_datadir}/evolution/help/quickref/sv
+%lang(sv) %{_datadir}/evolution/help/quickref/sv/quickref.pdf
+
+%{_datadir}/evolution/icons
+%{_datadir}/evolution/images
+%{_datadir}/evolution/sounds
+%{_datadir}/evolution/theme
+%{_datadir}/evolution/ui
 
 %{_iconsdir}/hicolor/*/apps/*
 %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 
 # PLUGINS
 # backup-restore
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-backup
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-backup-restore.so
-%{_datadir}/evolution/%{basever}/errors/org-gnome-backup-restore.error
+%attr(755,root,root) %{_libdir}/evolution/evolution-backup
+%attr(755,root,root) %{_libdir}/evolution/modules/module-backup-restore.so
+%{_datadir}/evolution/errors/org-gnome-backup-restore.error
 
 # prefer-plain
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-prefer-plain.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-prefer-plain.so
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-prefer-plain.so
 %{evo_plugins_dir}/org-gnome-prefer-plain.eplug
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
@@ -482,39 +476,38 @@ rm -rf $RPM_BUILD_ROOT
 # face plugin
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-face.so
 %{evo_plugins_dir}/org-gnome-face.eplug
-%{_datadir}/evolution/%{basever}/errors/org-gnome-face.error
+%{_datadir}/evolution/errors/org-gnome-face.error
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
 
 # external editor plugin
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-external-editor.so
 %{evo_plugins_dir}/org-gnome-external-editor.eplug
-%{_datadir}/evolution/%{basever}/errors/org-gnome-external-editor.error
+%{_datadir}/evolution/errors/org-gnome-external-editor.error
 
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/evolution
-%dir %{_libdir}/evolution/%{basever}
 %dir %{evo_plugins_dir}
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libeabutil.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libecontacteditor.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libecontactlisteditor.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libemail-engine.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libessmime.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-addressbook-importers.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-calendar.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-calendar-importers.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-formatter.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-composer.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-importers.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-shell.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-smime.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-util.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libgnomecanvas.so
+%attr(755,root,root) %{_libdir}/evolution/libeabutil.so
+%attr(755,root,root) %{_libdir}/evolution/libecontacteditor.so
+%attr(755,root,root) %{_libdir}/evolution/libecontactlisteditor.so
+%attr(755,root,root) %{_libdir}/evolution/libemail-engine.so
+%attr(755,root,root) %{_libdir}/evolution/libessmime.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-addressbook-importers.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-calendar.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-calendar-importers.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-mail-formatter.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-mail-composer.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-mail-importers.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-mail.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-shell.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-smime.so
+%attr(755,root,root) %{_libdir}/evolution/libevolution-util.so
+%attr(755,root,root) %{_libdir}/evolution/libgnomecanvas.so
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/%{name}-%{basever}
+%{_includedir}/evolution
 %{_pkgconfigdir}/libemail-engine.pc
 %{_pkgconfigdir}/evolution-calendar-3.0.pc
 %{_pkgconfigdir}/evolution-mail-3.0.pc
@@ -522,22 +515,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/evolution/%{basever}/libeabutil.a
-%{_libdir}/evolution/%{basever}/libecontacteditor.a
-%{_libdir}/evolution/%{basever}/libecontactlisteditor.a
-%{_libdir}/evolution/%{basever}/libemail-engine.a
-%{_libdir}/evolution/%{basever}/libessmime.a
-%{_libdir}/evolution/%{basever}/libevolution-addressbook-importers.a
-%{_libdir}/evolution/%{basever}/libevolution-calendar.a
-%{_libdir}/evolution/%{basever}/libevolution-calendar-importers.a
-%{_libdir}/evolution/%{basever}/libevolution-mail-composer.a
-%{_libdir}/evolution/%{basever}/libevolution-mail-formatter.a
-%{_libdir}/evolution/%{basever}/libevolution-mail-importers.a
-%{_libdir}/evolution/%{basever}/libevolution-mail.a
-%{_libdir}/evolution/%{basever}/libevolution-shell.a
-%{_libdir}/evolution/%{basever}/libevolution-smime.a
-%{_libdir}/evolution/%{basever}/libevolution-util.a
-%{_libdir}/evolution/%{basever}/libgnomecanvas.a
+%{_libdir}/evolution/libeabutil.a
+%{_libdir}/evolution/libecontacteditor.a
+%{_libdir}/evolution/libecontactlisteditor.a
+%{_libdir}/evolution/libemail-engine.a
+%{_libdir}/evolution/libessmime.a
+%{_libdir}/evolution/libevolution-addressbook-importers.a
+%{_libdir}/evolution/libevolution-calendar.a
+%{_libdir}/evolution/libevolution-calendar-importers.a
+%{_libdir}/evolution/libevolution-mail-composer.a
+%{_libdir}/evolution/libevolution-mail-formatter.a
+%{_libdir}/evolution/libevolution-mail-importers.a
+%{_libdir}/evolution/libevolution-mail.a
+%{_libdir}/evolution/libevolution-shell.a
+%{_libdir}/evolution/libevolution-smime.a
+%{_libdir}/evolution/libevolution-util.a
+%{_libdir}/evolution/libgnomecanvas.a
 
 %if %{with glade}
 %files glade
@@ -548,41 +541,41 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mail
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-mail.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-mail-config.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-mailto-handler.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-mdn.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-startup-wizard.so
-%{_datadir}/evolution/%{basever}/etspec/message-list.etspec
-%{_datadir}/evolution/%{basever}/errors/evolution-mdn.error
-%{_datadir}/evolution/%{basever}/errors/mail.error
-%{_datadir}/evolution/%{basever}/filtertypes.xml
-%{_datadir}/evolution/%{basever}/vfoldertypes.xml
-%{_datadir}/evolution/%{basever}/searchtypes.xml
-%{_datadir}/evolution/%{basever}/default/C/mail
-%{_datadir}/evolution/%{basever}/views/mail
-
-%lang(ca) %{_datadir}/evolution/%{basever}/default/ca/mail
-%lang(cs) %{_datadir}/evolution/%{basever}/default/cs/mail
-%lang(de) %{_datadir}/evolution/%{basever}/default/de/mail
-%lang(es) %{_datadir}/evolution/%{basever}/default/es/mail
-%lang(fi) %{_datadir}/evolution/%{basever}/default/fi/mail
-%lang(fr) %{_datadir}/evolution/%{basever}/default/fr/mail
-%lang(hu) %{_datadir}/evolution/%{basever}/default/hu/mail
-%lang(id) %{_datadir}/evolution/%{basever}/default/id/mail
-%lang(it) %{_datadir}/evolution/%{basever}/default/it/mail
-%lang(ja) %{_datadir}/evolution/%{basever}/default/ja/mail
-%lang(ko) %{_datadir}/evolution/%{basever}/default/ko/mail
-%lang(lt) %{_datadir}/evolution/%{basever}/default/lt/mail
-%lang(mk) %{_datadir}/evolution/%{basever}/default/mk/mail
-%lang(nl) %{_datadir}/evolution/%{basever}/default/nl/mail
-%lang(pl) %{_datadir}/evolution/%{basever}/default/pl/mail
-%lang(pt) %{_datadir}/evolution/%{basever}/default/pt/mail
-%lang(ro) %{_datadir}/evolution/%{basever}/default/ro/mail
-%lang(sr) %{_datadir}/evolution/%{basever}/default/sr/mail
-%lang(sr@latin) %{_datadir}/evolution/%{basever}/default/sr@latin/mail
-%lang(sv) %{_datadir}/evolution/%{basever}/default/sv/mail
-%lang(zh_CN) %{_datadir}/evolution/%{basever}/default/zh_CN/mail
+%attr(755,root,root) %{_libdir}/evolution/modules/module-mail.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-mail-config.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-mailto-handler.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-mdn.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-startup-wizard.so
+%{_datadir}/evolution/etspec/message-list.etspec
+%{_datadir}/evolution/errors/evolution-mdn.error
+%{_datadir}/evolution/errors/mail.error
+%{_datadir}/evolution/filtertypes.xml
+%{_datadir}/evolution/vfoldertypes.xml
+%{_datadir}/evolution/searchtypes.xml
+%{_datadir}/evolution/default/C/mail
+%{_datadir}/evolution/views/mail
+
+%lang(ca) %{_datadir}/evolution/default/ca/mail
+%lang(cs) %{_datadir}/evolution/default/cs/mail
+%lang(de) %{_datadir}/evolution/default/de/mail
+%lang(es) %{_datadir}/evolution/default/es/mail
+%lang(fi) %{_datadir}/evolution/default/fi/mail
+%lang(fr) %{_datadir}/evolution/default/fr/mail
+%lang(hu) %{_datadir}/evolution/default/hu/mail
+%lang(id) %{_datadir}/evolution/default/id/mail
+%lang(it) %{_datadir}/evolution/default/it/mail
+%lang(ja) %{_datadir}/evolution/default/ja/mail
+%lang(ko) %{_datadir}/evolution/default/ko/mail
+%lang(lt) %{_datadir}/evolution/default/lt/mail
+%lang(mk) %{_datadir}/evolution/default/mk/mail
+%lang(nl) %{_datadir}/evolution/default/nl/mail
+%lang(pl) %{_datadir}/evolution/default/pl/mail
+%lang(pt) %{_datadir}/evolution/default/pt/mail
+%lang(ro) %{_datadir}/evolution/default/ro/mail
+%lang(sr) %{_datadir}/evolution/default/sr/mail
+%lang(sr@latin) %{_datadir}/evolution/default/sr@latin/mail
+%lang(sv) %{_datadir}/evolution/default/sv/mail
+%lang(zh_CN) %{_datadir}/evolution/default/zh_CN/mail
 
 %{_desktopdir}/evolution-mail.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
@@ -592,7 +585,7 @@ rm -rf $RPM_BUILD_ROOT
 # attachment-reminder
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-evolution-attachment-reminder.so
 %{evo_plugins_dir}/org-gnome-evolution-attachment-reminder.eplug
-%{_datadir}/evolution/%{basever}/errors/org-gnome-attachment-reminder.error
+%{_datadir}/evolution/errors/org-gnome-attachment-reminder.error
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
 
 # bbdb
@@ -601,7 +594,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
 
 # bogofilter
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-bogofilter.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-bogofilter.so
 %{_datadir}/appdata/evolution-bogofilter.metainfo.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 
@@ -615,10 +608,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
 
 # itip-formatter
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-itip-formatter.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-itip-formatter.so
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-itip-formatter.so
 %{evo_plugins_dir}/org-gnome-itip-formatter.eplug
-%{_datadir}/evolution/%{basever}/errors/org-gnome-itip-formatter.error
+%{_datadir}/evolution/errors/org-gnome-itip-formatter.error
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
 
 # mail-notification
@@ -633,14 +626,14 @@ rm -rf $RPM_BUILD_ROOT
 # mailing-list-actions
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-mailing-list-actions.so
 %{evo_plugins_dir}/org-gnome-mailing-list-actions.eplug
-%{_datadir}/evolution/%{basever}/errors/org-gnome-mailing-list-actions.error
+%{_datadir}/evolution/errors/org-gnome-mailing-list-actions.error
 
 # pst-import
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-pst-import.so
 %{evo_plugins_dir}/org-gnome-pst-import.eplug
 
 # spamassassin
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-spamassassin.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-spamassassin.so
 %{_datadir}/appdata/evolution-spamassassin.metainfo.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
@@ -650,55 +643,55 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 
 # text-highlight
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-text-highlight.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-text-highlight.so
 
 # tnef-attachment
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-tnef-attachment.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-tnef-attachment.so
 
 # vcard-inline
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-vcard-inline.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-vcard-inline.so
 
 %files addressbook
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-addressbook.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/csv2vcard
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-addressbook-export
-%{_datadir}/evolution/%{basever}/ecps
-%{_datadir}/evolution/%{basever}/errors/addressbook.error
-%{_datadir}/evolution/%{basever}/etspec/e-addressbook-view.etspec
-%{_datadir}/evolution/%{basever}/views/addressbook
-%{_datadir}/evolution/%{basever}/addresstypes.xml
+%attr(755,root,root) %{_libdir}/evolution/modules/module-addressbook.so
+%attr(755,root,root) %{_libdir}/evolution/csv2vcard
+%attr(755,root,root) %{_libdir}/evolution/evolution-addressbook-export
+%{_datadir}/evolution/ecps
+%{_datadir}/evolution/errors/addressbook.error
+%{_datadir}/evolution/etspec/e-addressbook-view.etspec
+%{_datadir}/evolution/views/addressbook
+%{_datadir}/evolution/addresstypes.xml
 
 %{_desktopdir}/%{name}-addressbook.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
 
 # PLUGINS
 # ldap accounts config
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-book-config-ldap.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-ldap.so
 
 # google accounts config
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-book-config-google.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-google.so
 
 # addressbook-local
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-book-config-local.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-local.so
 
 # webdav-accounts-setup
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-book-config-webdav.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-webdav.so
 
 %files calendar
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-calendar.so
-%{_datadir}/evolution/%{basever}/etspec/e-cal-list-view.etspec
-%{_datadir}/evolution/%{basever}/etspec/e-calendar-table.etspec
-%{_datadir}/evolution/%{basever}/etspec/e-meeting-time-sel.etspec
-%{_datadir}/evolution/%{basever}/etspec/e-memo-table.etspec
-%{_datadir}/evolution/%{basever}/errors/calendar.error
-%{_datadir}/evolution/%{basever}/views/calendar
-%{_datadir}/evolution/%{basever}/views/memos
-%{_datadir}/evolution/%{basever}/views/tasks
-%{_datadir}/evolution/%{basever}/caltypes.xml
-%{_datadir}/evolution/%{basever}/memotypes.xml
-%{_datadir}/evolution/%{basever}/tasktypes.xml
+%attr(755,root,root) %{_libdir}/evolution/modules/module-calendar.so
+%{_datadir}/evolution/etspec/e-cal-list-view.etspec
+%{_datadir}/evolution/etspec/e-calendar-table.etspec
+%{_datadir}/evolution/etspec/e-meeting-time-sel.etspec
+%{_datadir}/evolution/etspec/e-memo-table.etspec
+%{_datadir}/evolution/errors/calendar.error
+%{_datadir}/evolution/views/calendar
+%{_datadir}/evolution/views/memos
+%{_datadir}/evolution/views/tasks
+%{_datadir}/evolution/caltypes.xml
+%{_datadir}/evolution/memotypes.xml
+%{_datadir}/evolution/tasktypes.xml
 
 %{_desktopdir}/%{name}-calendar.desktop
 %{_desktopdir}/%{name}-tasks.desktop
@@ -706,22 +699,22 @@ rm -rf $RPM_BUILD_ROOT
 
 # PLUGINS
 # caldav
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-cal-config-caldav.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-cal-config-caldav.so
 
 # contacts
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-cal-config-contacts.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-cal-config-contacts.so
 
 # calendar-local
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-cal-config-local.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-cal-config-local.so
 
 # calendar-weather
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-cal-config-weather.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-cal-config-weather.so
 
 # calendar-weather
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-cal-config-webcal.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-cal-config-webcal.so
 
 # google-account-setup
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-cal-config-google.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-cal-config-google.so
 
 # publish-calendar
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-publish-calendar.so