X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=evolution.spec;h=541478ab5e6abc38b73bdf79f7df87ac26f41f31;hb=41112b859b9a58692f2f2c3277755ac803cb8c8a;hp=9031dd1b7d195f97a5667da303386cc4d45a3052;hpb=94f0219b4bedcc58e53c4ec881f7e3961ecce2e0;p=packages%2Fevolution.git

diff --git a/evolution.spec b/evolution.spec
index 9031dd1..541478a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,59 +1,64 @@
-# TODO: gnome-autoar
 #
 # Conditional build:
+%bcond_without	autoar		# archives support in attachments via gnome-autoar
 %bcond_without	ldap		# LDAP support
 %bcond_without	contact_maps	# contact maps (libchamplain+clutter+geocode)
 %bcond_without	glade		# Glade catalog
 
+%define		eds_ver		%{version}
+
 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.16.0
+Version:	3.24.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Mail
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.16/%{name}-%{version}.tar.xz
-# Source0-md5:	21f7a5c78af4b10dcfb469efcb18b901
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	d3c7638be893d215b3727c559ac4d8a5
 Source3:	%{name}-addressbook.desktop
 Source4:	%{name}-calendar.desktop
 Source5:	%{name}-mail.desktop
 Source6:	%{name}-tasks.desktop
-Patch0:		%{name}-nolibs.patch
+Patch0:		%{name}-gtkdoc.patch
+Patch1:		%{name}-highlight.patch
+Patch2:		%{name}-destdir.patch
 URL:		http://wiki.gnome.org/Apps/Evolution/
 BuildRequires:	atk-devel
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.10
 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:	evolution-data-server-devel >= %{version}
+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
-BuildRequires:	gdk-pixbuf2-devel >= 2.24.0
 %{?with_glade:BuildRequires:	glade-devel >= 3.10.0}
-BuildRequires:	glib2-devel >= 1:2.40.0
+BuildRequires:	glib2-devel >= 1:2.46.0
+%if %{with autoar}
+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:	gtk-doc >= 1.14
-BuildRequires:	gtk-webkit3-devel >= 2.2.0
-BuildRequires:	gtkhtml-devel >= 4.5.2
+BuildRequires:	gtk-webkit4-devel >= 2.14.0
 BuildRequires:	gtkspell3-devel >= 3.0
-BuildRequires:	intltool >= 0.40.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:	libgdata-devel >= 0.10
-BuildRequires:	libgweather-devel >= 3.8.0
+BuildRequires:	libgweather-devel >= 3.10.0
 BuildRequires:	libical-devel
 BuildRequires:	libnotify-devel >= 0.7
 BuildRequires:	libpst-devel >= 0.6.54
@@ -78,12 +83,12 @@ BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-proto-xproto-devel
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-Requires(post,postun):	glib2 >= 1:2.40.0
+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 >= %{version}
+Requires:	evolution-data-server >= %{eds_ver}
 Requires:	gnome-icon-theme >= 3.2.0
 Requires:	gsettings-desktop-schemas >= 3.2.0
 Requires:	hicolor-icon-theme
@@ -96,6 +101,7 @@ Suggests:	adwaita-icon-theme
 Obsoletes:	evolution-mono
 Obsoletes:	evolution-pilot
 Obsoletes:	evolution-python
+Obsoletes:	evolution-static
 Obsoletes:	evolution2
 Obsoletes:	gnome-pim
 # sr@Latn vs. sr@latin
@@ -125,10 +131,13 @@ Group:		X11/Libraries
 Requires:	enchant >= 1.1.7
 Requires:	gcr >= 3.4
 Requires:	gdk-pixbuf2 >= 2.24.0
-Requires:	glib2 >= 1:2.40.0
+Requires:	glib2 >= 1:2.46.0
+%if %{with autoar}
+Requires:	gnome-autoar >= 0.1.1
+Requires:	gnome-autoar-gtk >= 0.1.1
+%endif
 Requires:	gtk+3 >= 3.10.0
-Requires:	gtk-webkit3 >= 2.2.0
-Requires:	gtkhtml >= 4.5.2
+Requires:	gtk-webkit4 >= 2.14.0
 Requires:	libcanberra-gtk3 >= 0.25
 Requires:	libsoup >= 2.42.0
 Requires:	libxml2 >= 1:2.7.3
@@ -147,12 +156,11 @@ Summary(zh_CN.UTF-8):	Evolution组件开发库
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	cyrus-sasl-devel
-Requires:	evolution-data-server-devel >= %{version}
-Requires:	glib2-devel >= 1:2.40.0
+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-webkit3-devel >= 2.2.0
-Requires:	gtkhtml-devel >= 4.5.3
+Requires:	gtk-webkit4-devel >= 2.14.0
 Requires:	libxml2-devel >= 1:2.7.3
 %{?with_ldap:Requires:	openldap-devel >= 2.4.6}
 Obsoletes:	evolution2-devel
@@ -205,7 +213,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.40.0
+Requires(post,postun):	glib2 >= 1:2.46.0
 # mail composer requires addressbook component
 Requires:	%{name}-addressbook = %{version}-%{release}
 Requires:	libpst >= 0.6.54
@@ -222,7 +230,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.40.0
+Requires(post,postun):	glib2 >= 1:2.46.0
 Requires:	%{name} = %{version}-%{release}
 %{?with_contact_maps:Requires:	clutter-gtk >= 0.90}
 %{?with_contact_maps:Requires:	geocode-glib >= 3.10.0}
@@ -240,10 +248,10 @@ 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.40.0
+Requires(post,postun):	glib2 >= 1:2.46.0
 Requires:	%{name} = %{version}-%{release}
 Requires:	libgdata >= 0.10
-Requires:	libgweather >= 3.8.0
+Requires:	libgweather >= 3.10.0
 Provides:	%{name}-component = %{version}-%{release}
 Obsoletes:	evolution-caldav
 Obsoletes:	evolution-webcal
@@ -272,43 +280,27 @@ Dokumentacja API Evolution.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-# ac_cv_libiconv=no to look iconv in libc (configure has inverted logic)
-%configure \
-	BOGOFILTER="/usr/bin/bogofilter" \
-	HIGHLIGHT="/usr/bin/highlight" \
-	SPAMASSASSIN="/usr/bin/spamassassin" \
-	SA_LEARN="/usr/bin/sa-learn" \
-	SPAMC="/usr/bin/spamc" \
-	SPAMD="/usr/bin/spamd" \
-	ac_cv_libiconv=no \
-	--enable-canberra \
-	%{?with_contact_maps:--enable-contact-maps} \
-	--enable-gtk-doc \
-	--enable-nss \
-	%{__with_without ldap openldap} \
-	--enable-plugins=all \
-	--enable-pst-import \
-	--disable-autoar \
-	--disable-silent-rules \
-	--enable-smime \
-	--enable-static \
-	--enable-weather \
-	%{?with_glade:--with-glade-catalog} \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-nspr-includes="%{_includedir}/nspr" \
-	--with-nspr-libs="%{_libdir}" \
-	--with-nss-includes="%{_includedir}/nss" \
-	--with-nss-libs="%{_libdir}" \
-	--without-static-ldap \
-	--with-sub-version=" PLD Linux"
+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} \
+	%{!?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_OPENLDAP=%{?with_ldap:ON}%{!?with_ldap:OFF} \
+	-DWITH_STATIC_LDAP=OFF \
+	-DWITH_GLADE_CATALOG=%{?with_glade:ON} \
+	-DVERSION_SUBSTRING=" PLD Linux"
 
 %{__make}
 
@@ -320,12 +312,6 @@ rm -rf $RPM_BUILD_ROOT
 
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
 
-# remove useless files
-%{__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
 %{__rm} $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop
 
 %find_lang %{name} --all-name --with-gnome
@@ -376,13 +362,20 @@ rm -rf $RPM_BUILD_ROOT
 %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-composer-to-meeting.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
+%attr(755,root,root) %{_libdir}/evolution/modules/module-webkit-editor.so
+%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
 
 %{_datadir}/GConf/gsettings/evolution.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
@@ -449,6 +442,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -495,8 +490,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution
 %dir %{evo_plugins_dir}
 %attr(755,root,root) %{_libdir}/evolution/libeabutil.so
+%attr(755,root,root) %{_libdir}/evolution/libeabwidgets.so
 %attr(755,root,root) %{_libdir}/evolution/libecontacteditor.so
+%attr(755,root,root) %{_libdir}/evolution/libecontactprint.so
 %attr(755,root,root) %{_libdir}/evolution/libecontactlisteditor.so
+%attr(755,root,root) %{_libdir}/evolution/libedomutils.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
@@ -519,25 +517,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/evolution-mail-3.0.pc
 %{_pkgconfigdir}/evolution-shell-3.0.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_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
 %defattr(644,root,root,755)
@@ -615,8 +594,6 @@ rm -rf $RPM_BUILD_ROOT
 
 # itip-formatter
 %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/errors/org-gnome-itip-formatter.error
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
 
@@ -636,6 +613,7 @@ 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
 
 # spamassassin
@@ -660,8 +638,6 @@ rm -rf $RPM_BUILD_ROOT
 %files addressbook
 %defattr(644,root,root,755)
 %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
@@ -688,9 +664,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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/etspec/e-task-table.etspec
 %{_datadir}/evolution/errors/calendar.error
 %{_datadir}/evolution/views/calendar
 %{_datadir}/evolution/views/memos