X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution.git;a=blobdiff_plain;f=evolution.spec;h=588dd56a9ee036dffa1ebd0d5893bfce95529f01;hp=22bd0e4c0fdc83b617c249abe084ad994d21f399;hb=c4719d7;hpb=6b413333bf63e642ba58f467d6b2ae6b92c453ce

diff --git a/evolution.spec b/evolution.spec
index 22bd0e4..588dd56 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,3 +1,4 @@
+# TODO: libunity >= 7.1.4?
 #
 # Conditional build:
 %bcond_without	autoar		# archives support in attachments via gnome-autoar
@@ -12,31 +13,28 @@ 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.24.3
+Version:	3.34.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Mail
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.24/%{name}-%{version}.tar.xz
-# Source0-md5:	094859230288448438ad428eb5716008
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.34/%{name}-%{version}.tar.xz
+# Source0-md5:	5f7b87e5db8d2ae971f4d62355272a44
 Source3:	%{name}-addressbook.desktop
 Source4:	%{name}-calendar.desktop
 Source5:	%{name}-mail.desktop
 Source6:	%{name}-tasks.desktop
 Patch0:		%{name}-gtkdoc.patch
 Patch1:		%{name}-highlight.patch
-Patch2:		%{name}-destdir.patch
-URL:		http://wiki.gnome.org/Apps/Evolution/
+URL:		https://wiki.gnome.org/Apps/Evolution/
 BuildRequires:	atk-devel
-BuildRequires:	bison
 BuildRequires:	cairo-gobject-devel
 %{?with_contact_maps:BuildRequires:	clutter-gtk-devel >= 0.90}
 BuildRequires:	cmake >= 3.1
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	enchant-devel >= 1.1.7
+BuildRequires:	enchant2-devel >= 2.2.0
 BuildRequires:	evolution-data-server-devel >= %{eds_ver}
 BuildRequires:	gcr-devel >= 3.4
 BuildRequires:	gdk-pixbuf2-devel >= 2.24.0
-BuildRequires:	geoclue-devel >= 0.12.0
 %{?with_contact_maps:BuildRequires:	geocode-glib-devel >= 3.10.0}
 BuildRequires:	gettext-tools >= 0.18.1
 %{?with_glade:BuildRequires:	glade-devel >= 3.10.0}
@@ -45,19 +43,16 @@ BuildRequires:	glib2-devel >= 1:2.46.0
 BuildRequires:	gnome-autoar-devel >= 0.1.1
 BuildRequires:	gnome-autoar-gtk-devel >= 0.1.1
 %endif
-BuildRequires:	gnome-common >= 2.26.0
 BuildRequires:	gnome-desktop-devel >= 3.2.0
 BuildRequires:	gsettings-desktop-schemas-devel >= 3.2.0
-BuildRequires:	gstreamer-devel
-BuildRequires:	gtk+3-devel >= 3.10.0
+BuildRequires:	gspell-devel >= 1
+BuildRequires:	gtk+3-devel >= 3.22.0
 BuildRequires:	gtk-doc >= 1.14
-BuildRequires:	gtk-webkit4-devel >= 2.14.0
-BuildRequires:	gtkspell3-devel >= 3.0
+BuildRequires:	gtk-webkit4-devel >= 2.16.0
 BuildRequires:	iso-codes >= 0.49
 BuildRequires:	itstool
 BuildRequires:	libcanberra-gtk3-devel >= 0.25
 %{?with_contact_maps:BuildRequires:	libchamplain-devel >= 0.12}
-BuildRequires:	libcryptui-devel
 BuildRequires:	libgweather-devel >= 3.10.0
 BuildRequires:	libical-devel
 BuildRequires:	libnotify-devel >= 0.7
@@ -78,14 +73,9 @@ BuildRequires:	rpmbuild(macros) >= 1.527
 BuildRequires:	shared-mime-info >= 0.22
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	which
-BuildRequires:	xorg-lib-libICE-devel
-BuildRequires:	xorg-lib-libSM-devel
-BuildRequires:	xorg-proto-xproto-devel
 BuildRequires:	xz
-BuildRequires:	yelp-tools
 Requires(post,postun):	glib2 >= 1:2.46.0
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	scrollkeeper
 Requires:	%{name}-component = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	evolution-data-server >= %{eds_ver}
@@ -104,8 +94,6 @@ Obsoletes:	evolution-python
 Obsoletes:	evolution-static
 Obsoletes:	evolution2
 Obsoletes:	gnome-pim
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		evo_plugins_dir		%{_libdir}/evolution/plugins
@@ -128,7 +116,7 @@ ferramentas interessantes.
 Summary:	Evolution libraries
 Summary(pl.UTF-8):	Biblioteki Evolution
 Group:		X11/Libraries
-Requires:	enchant >= 1.1.7
+Requires:	enchant2 >= 2.2.0
 Requires:	gcr >= 3.4
 Requires:	gdk-pixbuf2 >= 2.24.0
 Requires:	glib2 >= 1:2.46.0
@@ -136,8 +124,8 @@ Requires:	glib2 >= 1:2.46.0
 Requires:	gnome-autoar >= 0.1.1
 Requires:	gnome-autoar-gtk >= 0.1.1
 %endif
-Requires:	gtk+3 >= 3.10.0
-Requires:	gtk-webkit4 >= 2.14.0
+Requires:	gtk+3 >= 3.22.0
+Requires:	gtk-webkit4 >= 2.16.0
 Requires:	libcanberra-gtk3 >= 0.25
 Requires:	libsoup >= 2.42.0
 Requires:	libxml2 >= 1:2.7.3
@@ -159,8 +147,8 @@ Requires:	cyrus-sasl-devel
 Requires:	evolution-data-server-devel >= %{eds_ver}
 Requires:	glib2-devel >= 1:2.46.0
 Requires:	gnome-desktop-devel >= 3.2.0
-Requires:	gtk+3-devel >= 3.10.0
-Requires:	gtk-webkit4-devel >= 2.14.0
+Requires:	gtk+3-devel >= 3.22.0
+Requires:	gtk-webkit4-devel >= 2.16.0
 Requires:	libxml2-devel >= 1:2.7.3
 %{?with_ldap:Requires:	openldap-devel >= 2.4.6}
 Obsoletes:	evolution2-devel
@@ -281,22 +269,24 @@ Dokumentacja API Evolution.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
+install -d build
+cd build
 export BOGOFILTER="/usr/bin/bogofilter"
 export HIGHLIGHT="/usr/bin/highlight"
 export SPAMASSASSIN="/usr/bin/spamassassin"
 export SA_LEARN="/usr/bin/sa-learn"
 export SPAMC="/usr/bin/spamc"
 export SPAMD="/usr/bin/spamd"
-%cmake \
-	-DLIBEXEC_INSTALL_DIR=%{_libdir} \
+%cmake .. \
+	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
 	%{!?with_autoar:-DENABLE_AUTOAR=OFF} \
 	%{?with_contact_maps:-DENABLE_CONTACT_MAPS=ON} \
 	-DENABLE_GTK_DOC=ON \
 	-DENABLE_SCHEMAS_COMPILE=OFF \
 	-DGTK_UPDATE_ICON_CACHE=/bin/true \
+	-DWITH_ENCHANT_VERSION=2 \
 	-DWITH_OPENLDAP=%{?with_ldap:ON}%{!?with_ldap:OFF} \
 	-DWITH_STATIC_LDAP=OFF \
 	-DWITH_GLADE_CATALOG=%{?with_glade:ON} \
@@ -307,12 +297,12 @@ export SPAMD="/usr/bin/spamd"
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop
+%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/org.gnome.Evolution.desktop
 
 %find_lang %{name} --all-name --with-gnome
 
@@ -356,13 +346,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS* README
+# COPYING contains general license summary
+%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS* README.md
 %attr(755,root,root) %{_bindir}/evolution
-%attr(755,root,root) %{_libdir}/evolution/evolution-alarm-notify
-%attr(755,root,root) %{_libdir}/evolution/killev
+
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/evolution
+%endif
+%attr(755,root,root) %{_libexecdir}/evolution/killev
+
 %dir %{_libdir}/evolution/modules
+%attr(755,root,root) %{_libdir}/evolution/modules/module-accounts-window.so
 %attr(755,root,root) %{_libdir}/evolution/modules/module-composer-autosave.so
 %attr(755,root,root) %{_libdir}/evolution/modules/module-composer-to-meeting.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-config-lookup.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
@@ -373,23 +370,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/evolution/modules/module-webkit-inspector.so
 %dir %{_libdir}/evolution/web-extensions
 %attr(755,root,root) %{_libdir}/evolution/web-extensions/libewebextension.so
-%attr(755,root,root) %{_libdir}/evolution/web-extensions/module-itip-formatter-webextension.so
 %dir %{_libdir}/evolution/web-extensions/webkit-editor
 %attr(755,root,root) %{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
+%dir %{_libdir}/evolution-data-server/ui-modules
+%attr(755,root,root) %{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
 
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
-
-%{_datadir}/appdata/evolution.appdata.xml
+%{_datadir}/metainfo/org.gnome.Evolution.appdata.xml
+%{_mandir}/man1/evolution.1*
 
 %dir %{_datadir}/evolution
-%dir %{_datadir}/evolution/default
-%dir %{_datadir}/evolution/default/C
 %dir %{_datadir}/evolution/etspec
 %dir %{_datadir}/evolution/views
 
+%dir %{_datadir}/evolution/default
+%dir %{_datadir}/evolution/default/C
 %lang(ca) %dir %{_datadir}/evolution/default/ca
 %lang(cs) %dir %{_datadir}/evolution/default/cs
 %lang(de) %dir %{_datadir}/evolution/default/de
@@ -423,36 +421,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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(oc) %dir %{_datadir}/evolution/help/quickref/oc
-%lang(oc) %{_datadir}/evolution/help/quickref/oc/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
@@ -460,11 +428,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/ui
 
 %{_iconsdir}/hicolor/*/apps/*
-%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 
 # PLUGINS
 # backup-restore
-%attr(755,root,root) %{_libdir}/evolution/evolution-backup
+%attr(755,root,root) %{_libexecdir}/evolution/evolution-backup
 %attr(755,root,root) %{_libdir}/evolution/modules/module-backup-restore.so
 %{_datadir}/evolution/errors/org-gnome-backup-restore.error
 
@@ -531,15 +498,15 @@ rm -rf $RPM_BUILD_ROOT
 %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/etspec/message-list.etspec
+%{_datadir}/evolution/views/mail
 %{_datadir}/evolution/filtertypes.xml
 %{_datadir}/evolution/vfoldertypes.xml
 %{_datadir}/evolution/searchtypes.xml
-%{_datadir}/evolution/default/C/mail
-%{_datadir}/evolution/views/mail
 
+%{_datadir}/evolution/default/C/mail
 %lang(ca) %{_datadir}/evolution/default/ca/mail
 %lang(cs) %{_datadir}/evolution/default/cs/mail
 %lang(de) %{_datadir}/evolution/default/de/mail
@@ -580,8 +547,8 @@ rm -rf $RPM_BUILD_ROOT
 
 # bogofilter
 %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
+%{_datadir}/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml
 
 # dbx-import
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-dbx-import.so
@@ -613,12 +580,12 @@ rm -rf $RPM_BUILD_ROOT
 
 # pst-import
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-pst-import.so
-%{_datadir}/appdata/evolution-pst.metainfo.xml
 %{evo_plugins_dir}/org-gnome-pst-import.eplug
+%{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml
 
 # spamassassin
 %attr(755,root,root) %{_libdir}/evolution/modules/module-spamassassin.so
-%{_datadir}/appdata/evolution-spamassassin.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
 # templates
@@ -628,6 +595,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # text-highlight
 %attr(755,root,root) %{_libdir}/evolution/modules/module-text-highlight.so
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
 
 # tnef-attachment
 %attr(755,root,root) %{_libdir}/evolution/modules/module-tnef-attachment.so
@@ -657,17 +625,17 @@ rm -rf $RPM_BUILD_ROOT
 # addressbook-local
 %attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-local.so
 
-# webdav-accounts-setup
-%attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-webdav.so
+# carddav-accounts-setup
+%attr(755,root,root) %{_libdir}/evolution/modules/module-book-config-carddav.so
 
 %files calendar
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/evolution/modules/module-calendar.so
+%{_datadir}/evolution/errors/calendar.error
 %{_datadir}/evolution/etspec/e-cal-list-view.etspec
 %{_datadir}/evolution/etspec/e-meeting-time-sel.etspec
 %{_datadir}/evolution/etspec/e-memo-table.etspec
 %{_datadir}/evolution/etspec/e-task-table.etspec
-%{_datadir}/evolution/errors/calendar.error
 %{_datadir}/evolution/views/calendar
 %{_datadir}/evolution/views/memos
 %{_datadir}/evolution/views/tasks