X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution.git;a=blobdiff_plain;f=evolution.spec;h=d4b2256a51b974229556a7c1cb51ed84b8b81027;hp=dbf2523bbf88c07e663eb20a487d14da44c7ac55;hb=b29654a21a57bf2c702a9566099a2ce9125fc97f;hpb=1f6c0a1b3a35c3ed9dedebd6d4d6c849975338c5

diff --git a/evolution.spec b/evolution.spec
index dbf2523..d4b2256 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,71 +1,85 @@
-%define		mver		1.4
-%define		subver	0
-%define		_db3ver	3.1.17
-%define		_dbdir	$RPM_BUILD_DIR/%{name}-%{version}/db3-headers-%{_db3ver}
-
+#
+# todo:
+# - splitting mail, addressbook and calendar:
+#   - etspec?
+#   - ui?
+#   - dependencies, i.e.: mail should require addressbook?
+#
+# Conditional build:
+%bcond_without	ldap		# build without ldap support
+%bcond_without	kerberos5	# build without kerberos5 support
+%bcond_without	pilot		# build without pilot support
+#
+%define		basever	2.4
+#
 Summary:	The GNOME2 Email/Calendar/Addressbook Suite
 Summary(pl):	Klient poczty dla GNOME2/Kalendarz/Ksi±¿ka Adresowa
 Summary(pt_BR):	Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN):	Evolution - GNOME2¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:		evolution
-Version:	%{mver}.%{subver}
-Release:	1
-License:	GPL
+Version:	2.4.2.1
+Release:	2
+License:	GPL v2
 Group:		Applications/Mail
-Source0:	http://ftp.gnome.org/mirror/gnome.org/sources/evolution/%{mver}/%{name}-%{version}.tar.bz2
-# Source0-md5:	cc671769a912e315dc895f5b458e1a33
-Source1:	http://www.t17.ds.pwr.wroc.pl/~wiget/%{name}-db3-headers-%{_db3ver}.tar.bz2
-# Source1-md5:	6e5690aa2f0e5ec3e3bdfeb9106ea42a
-Patch0:		%{name}-nostaticdb3.patch
-Patch1:		%{name}-nolibs.patch
-Patch2:		%{name}-configure_in.patch
-Patch3:		%{name}-desktop.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5:	cee3e0ac6ca43e5060468c3b938bea72
+Source1:	%{name}-gg16.png
+Source2:	%{name}-gg48.png
+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
+Patch2:		%{name}-GG-IM.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
-BuildRequires:	GConf2-devel
-BuildRequires:	ORBit2-devel >= 2.3.0
-BuildRequires:	autoconf
+BuildRequires:	GConf2-devel >= 2.12.0
+BuildRequires:	ORBit2-devel >= 1:2.12.3
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	dbus-glib-devel
+BuildRequires:	evolution-data-server-devel >= 1.4.1
 BuildRequires:	flex
 BuildRequires:	freetype-devel >= 2.0.5
-BuildRequires:	gal-devel >= 1:1.99.7
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-pilot-devel >= 2.0.0
-BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gtk+2-devel
-Buildrequires:	gtk-doc >= 0.6
-BuildRequires:	gtkhtml-devel >= 3.0.5
-BuildRequires:	intltool >= 0.18
-BuildRequires:	libbonoboui-devel
-BuildRequires:	libglade2-devel
-BuildRequires:	libgnomecanvas-devel
-BuildRequires:	libgnomeprintui-devel >= 2.2.1
-BuildRequires:	libgnomeui-devel
-BuildRequires:	libsoup-devel >= 1.99.23
+BuildRequires:	gnome-common >= 2.8.0
+%{?with_pilot:BuildRequires:	gnome-pilot-devel >= 2.0.13}
+BuildRequires:	gnome-vfs2-devel >= 2.12.0
+BuildRequires:	gtk-doc >= 1.4
+BuildRequires:	gtkhtml-devel >= 3.8.1
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
+BuildRequires:	intltool >= 0.33
+BuildRequires:	libglade2-devel >= 1:2.5.1
+BuildRequires:	libgnomeprintui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libsoup-devel >= 2.2.6.1
 BuildRequires:	libtool
-BuildRequires:	libunicode-devel >= 0.4
 BuildRequires:	libxml2
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
-BuildRequires:	openldap-devel >= 2.0.0
-BuildRequires:	openssl-devel >= 0.9.7
-BuildRequires:	pilot-link-devel >= 0.11.4
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
+%{?with_pilot:BuildRequires:	pilot-link-devel >= 0.11.8}
 BuildRequires:	pkgconfig
 BuildRequires:	psmisc
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.1.4
-Requires(post,postun):	/sbin/ldconfig
-Requires(post,postun):	/usr/bin/scrollkeeper-update
-Requires(post):		GConf2
-Requires:	GConf2
+BuildRequires:	which
+Requires(post,preun):	GConf2
+Requires(post,postun):	scrollkeeper
+Requires:	%{name}-component = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	GConf2 >= 2.12.0
 Requires:	bonobo-activation
-Requires:	db3 = %{_db3ver}
-Requires:	gal >= 1:1.99.7
-Requires:	gtkhtml >= 3.0.5
-Requires:	libglade2
+Requires:	evolution-data-server >= 1.4.1
+Requires:	gtkhtml >= 3.8.1
+Requires:	hicolor-icon-theme
+Requires:	libglade2 >= 1:2.5.1
 Requires:	psmisc
 Requires:	scrollkeeper >= 0.1.4
 Obsoletes:	evolution2
+Obsoletes:	gnome-pim
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,26 +96,35 @@ narz
 Evolution é um cliente de email para o GNOME2 com calendário e outras
 ferramentas interessantes.
 
+%package libs
+Summary:	Evolution libraries
+Summary(pl):	Biblioteki Evolution
+Group:		Development/Libraries
+
+%description libs
+This package contains Evolution libraries.
+
+%description libs -l pl
+Pakiet zawiera biblioteki Evolution.
+
 %package devel
 Summary:	Header files for evolution
 Summary(pl):	Pliki nag³ówkowe i dokumentacja
 Summary(pt_BR):	Bibliotecas e arquivos de inclusão para desenvolvimento
 Summary(zh_CN):	Evolution×é¼þ¿ª·¢¿â
 Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	cyrus-sasl-devel
 Requires:	freetype-devel
-Requires:	gal-devel >= 1:1.99.7
-Requires:	gnome-vfs2-devel
-Requires:	gtkhtml-devel >= 3.0.5
-Requires:	libglade2-devel
-Requires:	libgnomeprintui-devel >= 2.2.1
-Requires:	libgnomeui-devel
-Requires:	libunicode-devel
+Requires:	gnome-vfs2-devel >= 2.12.1
+Requires:	gtkhtml-devel >= 3.8.1
+Requires:	libglade2-devel >= 1:2.5.1
+Requires:	libgnomeprintui-devel >= 2.12.0
+Requires:	libgnomeui-devel >= 2.12.0
+Requires:	libsoup-devel >= 2.2.6.1
 Requires:	nspr-devel
 Requires:	nss-devel
-Requires:	openldap-devel
-Requires:	openssl-devel >= 0.9.7
-Requires:	%{name} = %{version}
+%{?with_ldap:Requires:	openldap-devel >= 2.3.0}
 Obsoletes:	evolution2-devel
 
 %description devel
@@ -121,7 +144,7 @@ Summary:	Static libraries for evolution
 Summary(pl):	Biblioteki statyczne dla evolution
 Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 Obsoletes:	evolution2-static
 
 %description static
@@ -134,11 +157,55 @@ Pakiet zawiera statyczne biblioteki Evolution.
 Este pacote contém as bibliotecas estáticas para desenvolvimento de
 aplicações.
 
+%package mail
+Summary:	Evolution mail component
+Summary(pl):	Modu³ pocztowy Evolution
+Group:		X11/Applications
+# mail composer requires addressbook component
+Requires:	%{name}-addressbook = %{version}-%{release}
+Requires(post,preun):	GConf2
+Provides:	%{name}-component = %{version}-%{release}
+
+%description mail
+Evolution mail.
+
+%description mail -l pl
+Modu³ pocztowy Evolution.
+
+%package addressbook
+Summary:	Evolution addressbook component
+Summary(pl):	Modu³ ksi±¿ki adresowej Evolution
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires(post,preun):	GConf2
+Provides:	%{name}-component = %{version}-%{release}
+
+%description addressbook
+Evolution addressbook.
+
+%description addressbook -l pl
+Ksi±¿ka adresowa Evolution.
+
+%package calendar
+Summary:	Evolution calendar and todo component
+Summary(pl):	Modu³ kalendarza i listy zadañ Evolution
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires(post,preun):	GConf2
+Provides:	%{name}-component = %{version}-%{release}
+
+%description calendar
+Evolution calendar and todo component.
+
+%description calendar -l pl
+Kalendarz i lista zadañ Evolution.
+
 %package pilot
 Summary:	Evolution conduits for gnome-pilot
 Summary(pl):	Dodatki do wymiany danych z gnome-pilot
-Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	gnome-pilot
 Obsoletes:	evolution2-pilot
 
 %description pilot
@@ -150,45 +217,43 @@ Ten pakiet zawiera dodatki do synchronizacji danych Evolution z
 Palmem.
 
 %prep
-%setup -q -a1
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
-rm -f missing
-glib-gettextize --copy --force
-intltoolize --copy --force
-%{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-cd libical
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
-# don't use -f here
-automake -a -c --foreign
-cd ..
+%{__automake}
 %configure \
 	--enable-gtk-doc \
-	--enable-pilot-conduits=yes \
-	--with-openldap=yes \
+	%{?with_pilot:--enable-pilot-conduits=yes} \
+	%{!?with_pilot:--enable-pilot-conduits=no} \
+	%{?with_ldap:--with-openldap=yes} \
+	%{!?with_ldap:--with-openldap=no} \
+	%{?with_kerberos5:--with-krb5=%{_prefix}} \
+	%{!?with_kerberos5:--with-krb5=no} \
 	--without-static-ldap \
-	--enable-nntp=no \
-	--enable-file-locking=fcntl --enable-dot-locking=no \
+	--enable-nntp=yes \
+	--enable-file-locking=fcntl \
+	--enable-dot-locking=no \
 	--with-nspr-includes="%{_includedir}/nspr" \
 	--with-nss-includes="%{_includedir}/nss" \
 	--with-nspr-libs="%{_libdir}" \
 	--with-nss-libs="%{_libdir}" \
 	--enable-ipv6=yes \
 	--with-html-dir=%{_gtkdocdir} \
-	--with-db3-includes=%{_dbdir} \
-	--with-db3-libs=/lib \
-	--with-kde-applnk-path=no
+	--with-kde-applnk-path=no \
+	--disable-schemas-install \
+	--enable-nss=yes \
+	--enable-smime=yes \
+	--enable-static \
+	--enable-file-chooser
 
 # hack to rebuild *.c and *.h from *.idl (check if needed with new versions)
 # (required if you use ORBit2-devel 2.7.2)
@@ -199,90 +264,187 @@ find -name \*.idl -exec touch {} \;
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,48x48}/apps
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	KDE_APPLNK_DIR=%{_applnkdir}/Network/Mail \
 	omf_dest_dir=%{_omf_dest_dir}/%{name} \
-	GTKHTML_DATADIR=%{_datadir}/idl
+	GTKHTML_DATADIR=%{_datadir}/idl \
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/im-gadugadu.png
+install %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/im-gadugadu.png
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
 
-# strip doesn't pass these files and they aren't necessary, so remove them
-# probably this should be done differently, but I have no idea
-rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{mver}/*/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{mver}/libemiscwidgets.a
+# remove useless files
+rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 
-%find_lang evolution-1.4 --with-gnome
+ln -sf evolution-%{basever} $RPM_BUILD_ROOT%{_bindir}/evolution
+
+%find_lang %{name} --all-name --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%gconf_schema_install apps_evolution_shell-%{basever}.schemas
+%scrollkeeper_update_post
+
+%preun
+%gconf_schema_uninstall apps_evolution_shell-%{basever}.schemas
 
 %postun
-/sbin/ldconfig
-/usr/bin/scrollkeeper-update
+%scrollkeeper_update_postun
+
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
+%post mail
+%gconf_schema_install apps-evolution-mail-prompts-checkdefault-%{basever}.schemas
+%gconf_schema_install evolution-mail-%{basever}.schemas
+
+%preun mail
+%gconf_schema_uninstall apps-evolution-mail-prompts-checkdefault-%{basever}.schemas
+%gconf_schema_uninstall evolution-mail-%{basever}.schemas
+
+%post addressbook
+%gconf_schema_install apps_evolution_addressbook-%{basever}.schemas
+
+%preun addressbook
+%gconf_schema_uninstall apps_evolution_addressbook-%{basever}.schemas
 
-%files -f evolution-1.4.lang
+%post calendar
+%gconf_schema_install apps_evolution_calendar-%{basever}.schemas
+
+%preun calendar
+%gconf_schema_uninstall apps_evolution_calendar-%{basever}.schemas
+
+%files -f evolution.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS* README 
+%doc AUTHORS ChangeLog NEWS* README
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/evolution/*/*/*.so*
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/*.so.*
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/camel/*
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-alarm-notify
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-ldif-importer
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-vcard-importer
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-wombat
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-addressbook-clean
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-addressbook-import
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-launch-composer
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/csv2vcard
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/killev
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/load-*
+
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-alarm-notify
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/killev
 %dir %{_libdir}/evolution
-%dir %{_libdir}/evolution/%{mver}
-%dir %{_libdir}/evolution/%{mver}/camel*
-%dir %{_libdir}/evolution/%{mver}/components
-%dir %{_libdir}/evolution/%{mver}/evolution-mail-importers
-%{_libdir}/bonobo/servers/*
-%{_libdir}/evolution/%{mver}/camel-providers/*.urls
+%dir %{_libdir}/evolution/%{basever}
+%dir %{_libdir}/evolution/%{basever}/plugins
+%dir %{_libdir}/evolution/%{basever}/components
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*.so
+%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_*.server
+%{_libdir}/evolution/%{basever}/plugins/*.eplug
+%{_libdir}/evolution/%{basever}/plugins/*.xml
+
 %dir %{_datadir}/evolution
-%dir %{_datadir}/evolution/%{mver}
-%{_datadir}/evolution/%{mver}/*.xml
-%{_datadir}/evolution/%{mver}/*.schema
-%{_datadir}/evolution/%{mver}/Locations
-%{_datadir}/evolution/%{mver}/default_user
-%{_datadir}/evolution/%{mver}/ecps
-%{_datadir}/evolution/%{mver}/etspec
-%{_datadir}/evolution/%{mver}/glade
-%{_datadir}/evolution/%{mver}/images
-%{_datadir}/evolution/%{mver}/ui
-%{_datadir}/evolution/%{mver}/views
-%{_datadir}/evolution/%{mver}/zoneinfo
-%{_datadir}/mime-info/*
-%{_datadir}/idl/*
-%{_desktopdir}/*
-%{_pixmapsdir}/*
-%{_sysconfdir}/gconf/schemas/*
+%dir %{_datadir}/evolution/%{basever}
+%dir %{_datadir}/evolution/%{basever}/default
+%dir %{_datadir}/evolution/%{basever}/default/C
+%dir %{_datadir}/evolution/%{basever}/views
+%dir %{_datadir}/idl/evolution-%{basever}
+
+%{_datadir}/evolution/%{basever}/*.xml
+%lang(de) %dir %{_datadir}/evolution/%{basever}/default/de
+%lang(ja) %dir %{_datadir}/evolution/%{basever}/default/ja
+%lang(nl) %dir %{_datadir}/evolution/%{basever}/default/nl
+%lang(pt) %dir %{_datadir}/evolution/%{basever}/default/pt
+%lang(zh_CN) %dir %{_datadir}/evolution/%{basever}/default/zh_CN
+
+%{_datadir}/evolution/%{basever}/errors
+%{_datadir}/evolution/%{basever}/etspec
+%{_datadir}/evolution/%{basever}/glade
+%{_datadir}/evolution/%{basever}/help
+%{_datadir}/evolution/%{basever}/images
+%{_datadir}/evolution/%{basever}/ui
+%{_datadir}/evolution/%{basever}/weather
+
+%{_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/*.png
+%{_pixmapsdir}/*.png
+
 %{_omf_dest_dir}/%{name}
 
+%{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{basever}.schemas
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/lib*.so.*
+
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/*.so
-%{_libdir}/evolution/%{mver}/*.la
-%{_libdir}/evolution/*/*/*.la
-%{_includedir}/*
-%{_pkgconfigdir}/*
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/*.so
+%{_libdir}/evolution/%{basever}/*.la
+
+%{_includedir}/%{name}-%{basever}
+%{_pkgconfigdir}/evolution-*-%{basever}.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/evolution/%{mver}/*.a
+%{_libdir}/evolution/%{basever}/*.a
+
+%files mail
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-mail.so
+%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_*.server
+
+%{_datadir}/evolution/%{basever}/default/C/mail
+%{_datadir}/evolution/%{basever}/views/mail
+%lang(de) %{_datadir}/evolution/%{basever}/default/de/mail
+%lang(ja) %{_datadir}/evolution/%{basever}/default/ja/mail
+%lang(nl) %{_datadir}/evolution/%{basever}/default/nl/mail
+%lang(pt) %{_datadir}/evolution/%{basever}/default/pt/mail
+%lang(zh_CN) %{_datadir}/evolution/%{basever}/default/zh_CN/mail
+%{_datadir}/idl/evolution-%{basever}/Composer.idl
+%{_datadir}/idl/evolution-%{basever}/Evolution-Composer.idl
+%{_datadir}/idl/evolution-%{basever}/Evolution-Mail.idl
+
+%{_desktopdir}/%{name}-mail.desktop
+
+%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{basever}.schemas
+%{_sysconfdir}/gconf/schemas/evolution-mail-%{basever}.schemas
+
+%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}/csv2vcard
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-addressbook-clean
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-addressbook-export
+%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook*
+
+%{_datadir}/evolution/%{basever}/views/addressbook
+%{_datadir}/evolution/%{basever}/ecps
+
+%{_desktopdir}/%{name}-addressbook.desktop
+
+%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{basever}.schemas
+
+%files calendar
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-calendar.so
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar*
+
+%{_datadir}/evolution/%{basever}/views/calendar
+%{_datadir}/evolution/%{basever}/views/tasks
+%{_datadir}/idl/evolution-%{basever}/evolution-calendar.idl
+
+%{_desktopdir}/%{name}-calendar.desktop
+%{_desktopdir}/%{name}-tasks.desktop
+
+%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{basever}.schemas
 
+%if %{with pilot}
 %files pilot
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gnome-pilot/conduits/*
+%dir %{_libdir}/evolution/%{basever}/conduits
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/conduits/*.so
 %{_datadir}/gnome-pilot/conduits/*
+%endif