- updated to 2.30.0.1; merged changes from DEVEL

Changed files:
    evolution.spec -> 1.267

diff --git a/evolution.spec b/evolution.spec
index cfe60595be5e418a61f67e22d395e94b72fee514..4c209874320383a8a73c857895b9b8371ba1742b 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -4,19 +4,19 @@
 %bcond_without kerberos5       # build without kerberos5 support
 %bcond_without pilot           # build without pilot support
 #
-%define                basever 2.28
+%define                basever 2.30
 #
 Summary:       The GNOME Email/Calendar/Addressbook Suite
 Summary(pl.UTF-8):     Klient poczty dla GNOME/Kalendarz/Książka Adresowa
 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:       2.28.3.1
+Version:       2.30.0.1
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 3ddcefdcbcb04055393c547992c2f3da
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: 59746fd314deed2fea7fc5da7d92ff17
 Source1:       %{name}-gg16.png
 Source2:       %{name}-gg48.png
 Source3:       %{name}-addressbook.desktop
@@ -28,33 +28,35 @@ Patch1:             %{name}-gnome-icon-theme.patch
 URL:           http://www.gnome.org/projects/evolution/
 BuildRequires: GConf2-devel >= 2.28.0
 BuildRequires: NetworkManager-devel >= 0.7
-BuildRequires: ORBit2-devel >= 1:2.14.8
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake >= 1:1.9
 BuildRequires: bison
+BuildRequires: clutter-gtk-devel >= 0.10.0
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
-BuildRequires: evolution-data-server-devel >= 2.28.3.1
+BuildRequires: evolution-data-server-devel >= 2.30.0
+BuildRequires: geoclue-devel >= 0.11.1
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.20.0
+BuildRequires: glib2-devel >= 1:2.22.0
 BuildRequires: gnome-common >= 2.26.0
 BuildRequires: gnome-desktop-devel >= 2.28.0
 BuildRequires: gnome-doc-utils >= 0.14.0
-%{?with_pilot:BuildRequires:   gnome-pilot-devel >= 2.0.15}
+%{?with_pilot:BuildRequires:   gnome-pilot-devel >= 2.0.16}
 BuildRequires: gstreamer-devel
-BuildRequires: gtk+2-devel >= 2:2.16.0
-BuildRequires: gtkhtml-devel >= 3.28.3
-BuildRequires: hal-devel >= 0.5.10
-BuildRequires: intltool >= 0.40.0
+BuildRequires: gtk+2-devel >= 2:2.18.0
+BuildRequires: gtk-doc >= 1.9
+BuildRequires: gtkhtml-devel >= 3.30.0
+BuildRequires: gtkimageview-devel >= 1.6
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
-BuildRequires: libbonoboui-devel >= 2.24.0
-BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libcanberra-gtk-devel
 BuildRequires: libgnomecanvas-devel
-BuildRequires: libgnomeui-devel >= 2.24.0
-BuildRequires: libgweather-devel >= 2.26.0
+BuildRequires: libgweather-devel >= 2.28.0
 BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: libpst-devel
 BuildRequires: libsoup-devel >= 2.4.0
 BuildRequires: libtool
+BuildRequires: libunique-devel >= 1.1.2
 BuildRequires: libxml2-devel >= 1:2.7.3
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
@@ -74,10 +76,9 @@ Requires(post,postun):       scrollkeeper
 Requires(post,preun):  GConf2
 Requires:      %{name}-component = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      GConf2 >= 2.26.0
-Requires:      bonobo-activation
-Requires:      evolution-data-server >= 2.28.3.1
-Requires:      gtkhtml >= 3.28.3
+Requires:      GConf2 >= 2.28.0
+Requires:      evolution-data-server >= 2.30.0
+Requires:      gtkhtml >= 3.30.0
 Requires:      psmisc
 Obsoletes:     evolution2
 Obsoletes:     gnome-pim
@@ -105,7 +106,7 @@ ferramentas interessantes.
 Summary:       Evolution libraries
 Summary(pl.UTF-8):     Biblioteki Evolution
 Group:         X11/Libraries
-Requires:      glib2 >= 1:2.18.0
+Requires:      glib2 >= 1:2.22.0
 
 %description libs
 This package contains Evolution libraries.
@@ -121,15 +122,15 @@ Summary(zh_CN.UTF-8):     Evolution组件开发库
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      GConf2-devel >= 2.28.0
-Requires:      ORBit2-devel >= 1:2.14.8
 Requires:      cyrus-sasl-devel
-Requires:      evolution-data-server-devel >= 2.28.3.1
-Requires:      glib2-devel >= 1:2.20.0
-Requires:      gtk+2-devel >= 2:2.16.0
-Requires:      gtkhtml-devel >= 3.28.3
-Requires:      libglade2-devel >= 1:2.6.2
-Requires:      libgnomeui-devel >= 2.24.0
-Requires:      libxml2-devel >= 1:2.6.31
+Requires:      evolution-data-server-devel >= 2.30.0
+Requires:      glib2-devel >= 1:2.22.0
+Requires:      gnome-desktop-devel >= 2.28.0
+Requires:      gtk+2-devel >= 2:2.18.0
+Requires:      gtkhtml-devel >= 3.30.0
+Requires:      libgnomecanvas-devel
+Requires:      libunique-devel >= 1.1.2
+Requires:      libxml2-devel >= 1:2.7.3
 %{?with_ldap:Requires: openldap-devel >= 2.4.6}
 %{?with_pilot:Requires:        pilot-link-devel >= 0.11.8}
 Obsoletes:     evolution2-devel
@@ -224,11 +225,26 @@ your Palm with Evolution.
 Ten pakiet zawiera dodatki do synchronizacji danych Evolution z
 Palmem.
 
+%package apidocs
+Summary:       Evolution API documentation
+Summary(pl.UTF-8):     Dokumentacja API Evolution
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+Evolution API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Evolution.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
+%{__sed} -i -e 's/^en@shaw//' po/LINGUAS
+%{__rm} -f po/en@shaw.po
+
 %build
 %{__glib_gettextize}
 %{__intltoolize}
@@ -246,7 +262,6 @@ Palmem.
        %{?with_kerberos5:--with-krb5=%{_prefix}} \
        %{!?with_kerberos5:--with-krb5=no} \
        --without-static-ldap \
-       --enable-nntp=yes \
        --with-nspr-includes="%{_includedir}/nspr" \
        --with-nss-includes="%{_includedir}/nss" \
        --with-nspr-libs="%{_libdir}" \
@@ -257,14 +272,12 @@ Palmem.
        --enable-nss=yes \
        --enable-smime=yes \
        --enable-static \
-       --with-sub-version=" PLD Linux"
-
-# hack to rebuild *.c and *.h from *.idl (check if needed with new versions)
-# (required if you use ORBit2-devel 2.7.2)
-find -name \*.idl -exec touch {} \;
+       --with-sub-version=" PLD Linux" \
+       --enable-gtk-doc \
+       --with-html-dir=%{_gtkdocdir} \
+       --disable-silent-rules
 
-%{__make} \
-       GTKHTML_DATADIR=%{_datadir}/idl
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -273,7 +286,6 @@ install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,48x48}/apps
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
-       GTKHTML_DATADIR=%{_datadir}/idl \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/im-gadugadu.png
@@ -347,24 +359,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS* README
 %attr(755,root,root) %{_bindir}/evolution
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-alarm-notify
+%attr(755,root,root) %{_bindir}/evolution-alarm-notify
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/killev
+%dir %{_libdir}/evolution/%{basever}/modules
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-lib.so
 
-%{_libdir}/bonobo/servers/GNOME_Evolution_Shell.server
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 
-%{_datadir}/evolution/%{basever}/glade/e-active-connection-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/e-send-options.glade
-%{_datadir}/evolution/%{basever}/glade/e-table-config.glade
-%{_datadir}/evolution/%{basever}/glade/e-table-field-chooser.glade
-%{_datadir}/evolution/%{basever}/glade/e-timezone-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/filter.glade
-%{_datadir}/evolution/%{basever}/glade/gal-define-views.glade
-%{_datadir}/evolution/%{basever}/glade/gal-view-instance-save-as-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/gal-view-new-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/import.glade
-%{_datadir}/evolution/%{basever}/glade/smime-ui.glade
-
 %dir %{_datadir}/evolution
 %dir %{_datadir}/evolution/%{basever}
 %dir %{_datadir}/evolution/%{basever}/default
@@ -399,7 +400,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/%{basever}/errors/mail-composer.error
 %{_datadir}/evolution/%{basever}/errors/shell.error
 
-%dir %{_datadir}/evolution/%{basever}/glade
 %dir %{_datadir}/evolution/%{basever}/help
 %dir %{_datadir}/evolution/%{basever}/help/quickref
 %dir %{_datadir}/evolution/%{basever}/help/quickref/C
@@ -433,20 +433,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/%{basever}/sounds
 %{_datadir}/evolution/%{basever}/ui
 
-%dir %{_datadir}/idl/evolution-%{basever}
-%{_datadir}/idl/evolution-%{basever}/Evolution-Component.idl
-%{_datadir}/idl/evolution-%{basever}/Evolution-ConfigControl.idl
-%{_datadir}/idl/evolution-%{basever}/Evolution.idl
-%{_datadir}/idl/evolution-%{basever}/Evolution-Shell.idl
-
 %{_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) %{evo_plugins_dir}/liborg-gnome-backup-restore.so
 %{evo_plugins_dir}/org-gnome-backup-restore.eplug
-%{evo_plugins_dir}/org-gnome-backup-restore.xml
 %{_datadir}/evolution/%{basever}/errors/org-gnome-backup-restore.error
 
 # default-source
@@ -456,19 +450,18 @@ rm -rf $RPM_BUILD_ROOT
 # plugin-manager
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-plugin-manager.so
 %{evo_plugins_dir}/org-gnome-plugin-manager.eplug
-%{evo_plugins_dir}/org-gnome-plugin-manager.xml
 
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{basever}
-%dir %{_libdir}/evolution/%{basever}/components
 %dir %{evo_plugins_dir}
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libcomposer.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeabutil.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeconduit.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}/libefilterbar.so.*
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libemformat.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libemiscwidgets.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeshell.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libessmime.so.*
@@ -477,25 +470,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libetimezonedialog.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeutil.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-a11y.so.*
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-addressbook-a11y.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-addressbook-importers.so.*
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-cal-shared.so.*
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-calendar-a11y.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-importers.so.*
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-shared.so.*
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail.so.*
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-settings.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-smime.so.*
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-widgets-a11y.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libfilter.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libmenus.so.*
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libcomposer.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeabutil.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeconduit.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}/libefilterbar.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libemformat.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libemiscwidgets.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeshell.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libessmime.so
@@ -504,22 +496,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libetimezonedialog.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeutil.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-a11y.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-addressbook-a11y.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-addressbook-importers.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-cal-shared.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-calendar-a11y.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-importers.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-shared.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-mail-settings.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-smime.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/libevolution-widgets-a11y.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libfilter.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/libmenus.so
+%{_libdir}/evolution/%{basever}/libcomposer.la
 %{_libdir}/evolution/%{basever}/libeabutil.la
 %{_libdir}/evolution/%{basever}/libeconduit.la
 %{_libdir}/evolution/%{basever}/libecontacteditor.la
 %{_libdir}/evolution/%{basever}/libecontactlisteditor.la
-%{_libdir}/evolution/%{basever}/libefilterbar.la
+%{_libdir}/evolution/%{basever}/libemformat.la
 %{_libdir}/evolution/%{basever}/libemiscwidgets.la
 %{_libdir}/evolution/%{basever}/libeshell.la
 %{_libdir}/evolution/%{basever}/libessmime.la
@@ -528,28 +519,29 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{basever}/libetimezonedialog.la
 %{_libdir}/evolution/%{basever}/libeutil.la
 %{_libdir}/evolution/%{basever}/libevolution-a11y.la
-%{_libdir}/evolution/%{basever}/libevolution-addressbook-a11y.la
 %{_libdir}/evolution/%{basever}/libevolution-addressbook-importers.la
-%{_libdir}/evolution/%{basever}/libevolution-cal-shared.la
-%{_libdir}/evolution/%{basever}/libevolution-calendar-a11y.la
+%{_libdir}/evolution/%{basever}/libevolution-calendar.la
 %{_libdir}/evolution/%{basever}/libevolution-calendar-importers.la
 %{_libdir}/evolution/%{basever}/libevolution-mail-importers.la
-%{_libdir}/evolution/%{basever}/libevolution-mail-shared.la
+%{_libdir}/evolution/%{basever}/libevolution-mail.la
+%{_libdir}/evolution/%{basever}/libevolution-mail-settings.la
 %{_libdir}/evolution/%{basever}/libevolution-smime.la
-%{_libdir}/evolution/%{basever}/libevolution-widgets-a11y.la
 %{_libdir}/evolution/%{basever}/libfilter.la
 %{_libdir}/evolution/%{basever}/libmenus.la
 %{_includedir}/%{name}-%{basever}
+%{_pkgconfigdir}/evolution-calendar.pc
+%{_pkgconfigdir}/evolution-mail.pc
 %{_pkgconfigdir}/evolution-plugin.pc
 %{_pkgconfigdir}/evolution-shell.pc
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/evolution/%{basever}/libcomposer.a
 %{_libdir}/evolution/%{basever}/libeabutil.a
 %{_libdir}/evolution/%{basever}/libeconduit.a
 %{_libdir}/evolution/%{basever}/libecontacteditor.a
 %{_libdir}/evolution/%{basever}/libecontactlisteditor.a
-%{_libdir}/evolution/%{basever}/libefilterbar.a
+%{_libdir}/evolution/%{basever}/libemformat.a
 %{_libdir}/evolution/%{basever}/libemiscwidgets.a
 %{_libdir}/evolution/%{basever}/libeshell.a
 %{_libdir}/evolution/%{basever}/libessmime.a
@@ -558,25 +550,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{basever}/libetimezonedialog.a
 %{_libdir}/evolution/%{basever}/libeutil.a
 %{_libdir}/evolution/%{basever}/libevolution-a11y.a
-%{_libdir}/evolution/%{basever}/libevolution-addressbook-a11y.a
 %{_libdir}/evolution/%{basever}/libevolution-addressbook-importers.a
-%{_libdir}/evolution/%{basever}/libevolution-cal-shared.a
-%{_libdir}/evolution/%{basever}/libevolution-calendar-a11y.a
+%{_libdir}/evolution/%{basever}/libevolution-calendar.a
 %{_libdir}/evolution/%{basever}/libevolution-calendar-importers.a
 %{_libdir}/evolution/%{basever}/libevolution-mail-importers.a
-%{_libdir}/evolution/%{basever}/libevolution-mail-shared.a
+%{_libdir}/evolution/%{basever}/libevolution-mail.a
+%{_libdir}/evolution/%{basever}/libevolution-mail-settings.a
 %{_libdir}/evolution/%{basever}/libevolution-smime.a
-%{_libdir}/evolution/%{basever}/libevolution-widgets-a11y.a
 %{_libdir}/evolution/%{basever}/libfilter.a
 %{_libdir}/evolution/%{basever}/libmenus.a
 
 %files mail
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-mail.so
+%attr(755,root,root) %{_bindir}/evolution-settings
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-mail.so
 %{_datadir}/evolution/%{basever}/etspec/message-list.etspec
 %{_datadir}/evolution/%{basever}/errors/mail.error
-%{_datadir}/evolution/%{basever}/glade/mail-config.glade
-%{_datadir}/evolution/%{basever}/glade/mail-dialogs.glade
 %{_datadir}/evolution/%{basever}/filtertypes.xml
 %{_datadir}/evolution/%{basever}/vfoldertypes.xml
 %{_datadir}/evolution/%{basever}/searchtypes.xml
@@ -604,17 +593,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_datadir}/evolution/%{basever}/default/sv/mail
 %lang(zh_CN) %{_datadir}/evolution/%{basever}/default/zh_CN/mail
 
-%{_datadir}/idl/evolution-%{basever}/Evolution-Mail.idl
-%{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server
-
-%{_desktopdir}/%{name}-mail.desktop
+%{_desktopdir}/evolution-mail.desktop
+%{_desktopdir}/evolution-settings.desktop
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 # PLUGINS
 # attachment-reminder
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-evolution-attachment-reminder.so
 %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
-%{evo_plugins_dir}/attachment-reminder.glade
 %{evo_plugins_dir}/org-gnome-evolution-attachment-reminder.eplug
 %{_datadir}/evolution/%{basever}/errors/org-gnome-attachment-reminder.error
 
@@ -631,10 +617,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugins_dir}/org-gnome-bogo-junk-plugin.eplug
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
 
-# copy-tool
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-copy-tool.so
-%{evo_plugins_dir}/org-gnome-copy-tool.eplug
-
 # default-mailer
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-default-mailer.so
 %{evo_plugins_dir}/org-gnome-default-mailer.eplug
@@ -644,31 +626,11 @@ rm -rf $RPM_BUILD_ROOT
 # email-custom-header
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-email-custom-header.so
 %{evo_plugins_dir}/org-gnome-email-custom-header.eplug
-%{_datadir}/evolution/%{basever}/glade/email-custom-header.glade
-%{_datadir}/evolution/%{basever}/glade/org-gnome-email-custom-header.glade
 %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
 
-# exchange-operations
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-exchange-operations.so
-%{evo_plugins_dir}/org-gnome-exchange-operations.eplug
-%{evo_plugins_dir}/org-gnome-exchange-ab-subscription.xml
-%{evo_plugins_dir}/org-gnome-exchange-cal-subscription.xml
-%{evo_plugins_dir}/org-gnome-exchange-tasks-subscription.xml
-%{evo_plugins_dir}/org-gnome-folder-permissions.xml
-%{evo_plugins_dir}/org-gnome-folder-subscription.xml
-%{_datadir}/evolution/%{basever}/errors/org-gnome-exchange-operations.error
-%{_datadir}/evolution/%{basever}/glade/e-foreign-folder-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-change-password.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-delegates.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-folder-tree.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-oof.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-passwd-expiry.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-permissions-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/exchange-send-options.glade
-
-# groupwise-account-setup
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-gw-account-setup.so
-%{evo_plugins_dir}/org-gnome-gw-account-setup.eplug
+# image-inline
+%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-image-inline.so
+%{evo_plugins_dir}/org-gnome-image-inline.eplug
 
 # groupwise-features
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-groupwise-features.so
@@ -679,26 +641,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/%{basever}/errors/org-gnome-proxy-login.error
 %{_datadir}/evolution/%{basever}/errors/org-gnome-proxy.error
 %{_datadir}/evolution/%{basever}/errors/org-gnome-shared-folder.error
-%{_datadir}/evolution/%{basever}/glade/properties.glade
-%{_datadir}/evolution/%{basever}/glade/junk-settings.glade
-%{_datadir}/evolution/%{basever}/glade/proxy-add-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/proxy-listing.glade
-%{_datadir}/evolution/%{basever}/glade/proxy-login-dialog.glade
 
 # imap-features
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-imap-features.so
 %{evo_plugins_dir}/org-gnome-imap-features.eplug
-%{_datadir}/evolution/%{basever}/glade/imap-headers.glade
 
 # itip-formatter
 %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
 
-# mail-account-disable
-%attr(755,root,root) %{evo_plugins_dir}/libmail-account-disable.so
-%{evo_plugins_dir}/org-gnome-mail-account-disable.eplug
-
 # mail-notification
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-mail-notification.so
 %{evo_plugins_dir}/org-gnome-mail-notification.eplug
@@ -707,18 +659,20 @@ rm -rf $RPM_BUILD_ROOT
 # mail-to-task
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-mail-to-task.so
 %{evo_plugins_dir}/org-gnome-mail-to-task.eplug
-%{evo_plugins_dir}/org-gnome-mail-to-task.xml
 
 # 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
-%{evo_plugins_dir}/org-gnome-mailing-list-actions.xml
 %{_datadir}/evolution/%{basever}/errors/org-gnome-mailing-list-actions.error
 
 # mark-all-read
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-mark-all-read.so
 %{evo_plugins_dir}/org-gnome-mark-all-read.eplug
 
+# pst-import
+%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-pst-import.so
+%{evo_plugins_dir}/org-gnome-pst-import.eplug
+
 # sa-junk-plugin
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-sa-junk-plugin.so
 %{evo_plugins_dir}/org-gnome-sa-junk-plugin.eplug
@@ -734,7 +688,6 @@ rm -rf $RPM_BUILD_ROOT
 # templates
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-templates.so
 %{evo_plugins_dir}/org-gnome-templates.eplug
-%{evo_plugins_dir}/templates.glade
 %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
 
 # vcard-inline
@@ -743,22 +696,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files addressbook
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-addressbook.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-addressbook.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/csv2vcard
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-addressbook-clean
 %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}/glade/ldap-config.glade
-%{_datadir}/evolution/%{basever}/glade/contact-editor.glade
-%{_datadir}/evolution/%{basever}/glade/fullname.glade
-%{_datadir}/evolution/%{basever}/glade/contact-list-editor.glade
-%{_datadir}/evolution/%{basever}/glade/eab-contact-commit-duplicate-detected.glade
-%{_datadir}/evolution/%{basever}/glade/eab-contact-duplicate-detected.glade
 %{_datadir}/evolution/%{basever}/views/addressbook
 %{_datadir}/evolution/%{basever}/addresstypes.xml
-%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook.server
 
 %{_desktopdir}/%{name}-addressbook.desktop
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
@@ -773,34 +719,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files calendar
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-calendar.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-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}/glade/alarm-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/alarm-list-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/alarm-notify.glade
-%{_datadir}/evolution/%{basever}/glade/cal-prefs-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/e-delegate-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/e-itip-control.glade
-%{_datadir}/evolution/%{basever}/glade/event-page.glade
-%{_datadir}/evolution/%{basever}/glade/goto-dialog.glade
-%{_datadir}/evolution/%{basever}/glade/memo-page.glade
-%{_datadir}/evolution/%{basever}/glade/recurrence-page.glade
-%{_datadir}/evolution/%{basever}/glade/schedule-page.glade
-%{_datadir}/evolution/%{basever}/glade/task-details-page.glade
-%{_datadir}/evolution/%{basever}/glade/task-page.glade
 %{_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
-%{_datadir}/idl/evolution-%{basever}/evolution-calendar.idl
-%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar.server
-%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
 
 %{_desktopdir}/%{name}-calendar.desktop
 %{_desktopdir}/%{name}-tasks.desktop
@@ -822,30 +752,19 @@ rm -rf $RPM_BUILD_ROOT
 # calendar-weather
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-calendar-weather.so
 %{evo_plugins_dir}/org-gnome-calendar-weather.eplug
-%{_datadir}/evolution/%{basever}/weather
 
 # google-account-setup
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-evolution-google.so
 %{evo_plugins_dir}/org-gnome-evolution-google.eplug
 
-## mark-calendar-offline
-#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-mark-calendar-offline.so
-#%{evo_plugins_dir}/org-gnome-mark-calendar-offline.eplug
-
 # publish-calendar
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-publish-calendar.so
 %{evo_plugins_dir}/org-gnome-publish-calendar.eplug
-%{evo_plugins_dir}/org-gnome-publish-calendar.xml
-%{_datadir}/evolution/%{basever}/glade/publish-calendar.glade
 
 # save-calendar
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-save-calendar.so
 %{evo_plugins_dir}/org-gnome-save-calendar.eplug
 
-# select-one-source
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-select-one-source.so
-%{evo_plugins_dir}/org-gnome-select-one-source.eplug
-
 %if %{with pilot}
 %files pilot
 %defattr(644,root,root,755)
@@ -860,3 +779,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-pilot/conduits/e-memo.conduit
 %{_datadir}/gnome-pilot/conduits/e-todo.conduit
 %endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/eshell