X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=evolution.spec;h=23a53c010662ff03995ec09a74c325f8ef4ed892;hb=325896376807c9a2f3d31b16e218dca0457b1adb;hp=b27f29fe350a80305f6310aef385bb3bb4614453;hpb=f7fe4d8402349393e1686c772414d8408a66e46d;p=packages%2Fevolution.git

diff --git a/evolution.spec b/evolution.spec
index b27f29f..23a53c0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -12,18 +12,19 @@ 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.1
+Version:	3.26.0
 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:	d3c7638be893d215b3727c559ac4d8a5
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.26/%{name}-%{version}.tar.xz
+# Source0-md5:	91d587417aba71301a4d4a6294a331c1
 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/
 BuildRequires:	atk-devel
 BuildRequires:	bison
@@ -50,7 +51,7 @@ 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-webkit4-devel >= 2.14.0
+BuildRequires:	gtk-webkit4-devel >= 2.16.0
 BuildRequires:	gtkspell3-devel >= 3.0
 BuildRequires:	iso-codes >= 0.49
 BuildRequires:	itstool
@@ -136,7 +137,7 @@ 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-webkit4 >= 2.16.0
 Requires:	libcanberra-gtk3 >= 0.25
 Requires:	libsoup >= 2.42.0
 Requires:	libxml2 >= 1:2.7.3
@@ -159,7 +160,7 @@ 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-webkit4-devel >= 2.16.0
 Requires:	libxml2-devel >= 1:2.7.3
 %{?with_ldap:Requires:	openldap-devel >= 2.4.6}
 Obsoletes:	evolution2-devel
@@ -280,6 +281,7 @@ Dokumentacja API Evolution.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export BOGOFILTER="/usr/bin/bogofilter"
@@ -292,11 +294,12 @@ export SPAMD="/usr/bin/spamd"
 	-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} \
-	-DENABLE_GTK_DOC=ON \
-	-DENABLE_SCHEMAS_COMPILE=OFF \
 	-DVERSION_SUBSTRING=" PLD Linux"
 
 %{__make}
@@ -358,8 +361,10 @@ rm -rf $RPM_BUILD_ROOT
 %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-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
@@ -625,6 +630,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