X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=fe23160ef8733acb2b5dcb644c45ecf7f0fbaac2;hp=ede36e7741bd3ceb3621bf78dd1654834f5b4ee9;hb=c12b75f23e062bb5fab8f78a8d1470a3eda213a9;hpb=13d2ac8197cfc7d0201aad81612393aecc4245b5

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index ede36e7..fe23160 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,23 +1,23 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
-%bcond_without	kerberos5	# build without kerberos5 support
-%bcond_without	ldap		# build without ldap support
+%bcond_without	kerberos5	# build without Kerberos5 support
+%bcond_without	ldap		# build without LDAP support
 %bcond_without	static_libs	# do not build static libs
 %bcond_without	uoa		# single sign-on (aka Ubuntu Online Accounts)
 %bcond_without	vala		# do not build Vala API
 
-%define		basever		3.16
+%define		basever		3.20
 %define		apiver		1.2
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	3.16.2
+Version:	3.20.1
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.16/%{name}-%{version}.tar.xz
-# Source0-md5:	ef14158fb0486189bc4fe2a8252f6e20
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.20/%{name}-%{version}.tar.xz
+# Source0-md5:	7c6ff622bc1e07841b215a7394ba5ea6
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
@@ -30,14 +30,15 @@ BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gnome-online-accounts-devel >= 3.8.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gperf
-BuildRequires:	gtk+3-devel >= 3.6.0
+BuildRequires:	gtk+3-devel >= 3.10.0
+BuildRequires:	gtk-webkit3-devel >= 2.4.9
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	intltool >= 0.40.0
-%{?with_uoa:BuildRequires:	json-glib-devel}
+BuildRequires:	json-glib-devel >= 1.0.4
 %{?with_uoa:BuildRequires:	libaccounts-glib-devel >= 1.4}
 BuildRequires:	libgdata-devel >= 0.15.1
-BuildRequires:	libgweather-devel >= 3.8
+BuildRequires:	libgweather-devel >= 3.10
 BuildRequires:	libical-devel >= 0.43
 BuildRequires:	libicu-devel
 BuildRequires:	libsecret-devel >= 0.5
@@ -48,12 +49,11 @@ BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	nspr-devel >= 4
 BuildRequires:	nss-devel >= 3
-%{?with_ldap:BuildRequires:	openldap-evolution-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
 BuildRequires:	pkgconfig
 %{?with_uoa:BuildRequires:	rest-devel >= 0.7}
 BuildRequires:	rpmbuild(macros) >= 1.304
-BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.5
+BuildRequires:	sqlite3-devel >= 3.7.17
 BuildRequires:	tar >= 1:1.22
 %{?with_vala:BuildRequires:	vala >= 2:0.22.0}
 BuildRequires:	xz
@@ -61,9 +61,9 @@ BuildRequires:	zlib-devel
 Requires(post,postun):	glib2 >= 1:2.40.0
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gnome-online-accounts-libs >= 3.8.0
-Requires:	gtk+3 >= 3.6.0
+Requires:	gtk+3 >= 3.10.0
 Requires:	libgdata >= 0.15.1
-Requires:	libgweather >= 3.8
+Requires:	libgweather >= 3.10
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -129,11 +129,12 @@ Group:		X11/Libraries
 Requires:	gcr-libs >= 3.4.0
 Requires:	gcr-ui >= 3.4.0
 Requires:	glib2 >= 1:2.40.0
+Requires:	json-glib >= 1.0.4
 Requires:	libical >= 0.43
 Requires:	libsecret >= 0.5
 Requires:	libsoup >= 2.42.0
 Requires:	libxml2 >= 1:2.6.31
-Requires:	sqlite3 >= 3.5
+Requires:	sqlite3 >= 3.7.17
 
 %description libs
 This package contains Evolution Data Server library.
@@ -157,7 +158,7 @@ Requires:	libsoup-devel >= 2.42.0
 Requires:	libxml2-devel >= 1:2.6.31
 Requires:	nspr-devel >= 4
 Requires:	nss-devel >= 3
-Requires:	sqlite3-devel >= 3.5
+Requires:	sqlite3-devel >= 3.7.17
 
 %description devel
 This package contains the files necessary to develop applications
@@ -184,6 +185,9 @@ Summary:	Evolution data server API documentation
 Summary(pl.UTF-8):	Dokumentacja API serwera danych Evolution
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Evolution data server API documentation.
@@ -197,6 +201,9 @@ Summary(pl.UTF-8):	API serwera danych Evolution dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	vala >= 2:0.22.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n vala-evolution-data-server
 Evolution data server API for Vala language.
@@ -207,9 +214,6 @@ API serwera danych Evolution dla języka Vala.
 %prep
 %setup -q
 
-# kill -L$withval/lib
-%{__sed} -i -e 's/DB_LIBS="-L[^ "]* /DB_LIBS="/;s/ICONV_LIBS="[^ "]*/ICONV_LIBS="/' configure.ac
-
 %build
 %{__gtkdocize}
 %{__intltoolize}
@@ -219,28 +223,18 @@ API serwera danych Evolution dla języka Vala.
 %{__autoconf}
 %{__automake}
 
-# Set LIBS so that configure will be able to link with static LDAP libraries,
-# which depend on Cyrus SASL and OpenSSL.
-if pkg-config openssl ; then
-	LIBS="-lsasl2 `pkg-config --libs openssl`"
-else
-	LIBS="-lsasl2 -lssl -lcrypto"
-fi
-export LIBS
-
 %configure \
+	DB_LIBS="-ldb" \
+	ac_cv_libiconv=no \
 	%{?with_kerberos5:--with-krb5=%{_prefix} --with-krb5-libs=%{_libdir}} \
 	%{!?with_kerberos5:--with-krb5=no} \
-	%{?with_ldap:--with-openldap=%{_libdir}/evolution-openldap} \
-	%{?with_ldap:--with-static-ldap=yes} \
-	%{!?with_ldap:--with-openldap=no} \
+	--with-openldap%{!?with_ldap:=no} \
 	--enable-smime \
 	--enable-ipv6 \
 	%{__enable_disable apidocs gtk-doc} \
 	%{__enable_disable static_libs static} \
 	%{__enable_disable vala vala-bindings} \
 	%{!?with_uoa:--disable-uoa} \
-	--with-libdb=%{_libdir} \
 	--with-html-dir=%{_gtkdocdir} \
 	--disable-silent-rules
 
@@ -335,6 +329,11 @@ fi
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-trust-prompt.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-yahoo-backend.so
 
+%{systemduserunitdir}/evolution-addressbook-factory.service
+%{systemduserunitdir}/evolution-calendar-factory.service
+%{systemduserunitdir}/evolution-source-registry.service
+%{systemduserunitdir}/evolution-user-prompter.service
+
 %dir %{_libdir}/%{name}-%{basever}
 %dir %{_datadir}/%{name}
 %{_pixmapsdir}/%{name}
@@ -389,21 +388,21 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcamel-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.52
+%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.57
 %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.10
 %attr(755,root,root) %{_libdir}/libebook-%{apiver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.16
 %attr(755,root,root) %{_libdir}/libebook-contacts-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebook-contacts-%{apiver}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libebook-contacts-%{apiver}.so.2
 %attr(755,root,root) %{_libdir}/libecal-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libecal-%{apiver}.so.18
+%attr(755,root,root) %ghost %{_libdir}/libecal-%{apiver}.so.19
 %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.25
 %attr(755,root,root) %{_libdir}/libedata-cal-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{apiver}.so.27
+%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{apiver}.so.28
 %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.20
+%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.21
 %attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver}.so.1
 %{_libdir}/girepository-1.0/EBook-%{apiver}.typelib
@@ -432,6 +431,7 @@ fi
 %{_pkgconfigdir}/libedata-cal-%{apiver}.pc
 %{_pkgconfigdir}/libedataserver-%{apiver}.pc
 %{_pkgconfigdir}/libedataserverui-%{apiver}.pc
+%{_datadir}/gir-1.0/Camel-1.2.gir
 %{_datadir}/gir-1.0/EBook-%{apiver}.gir
 %{_datadir}/gir-1.0/EBookContacts-%{apiver}.gir
 %{_datadir}/gir-1.0/EDataServer-%{apiver}.gir
@@ -460,6 +460,8 @@ fi
 %if %{with vala}
 %files -n vala-evolution-data-server
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/camel-1.2.deps
+%{_datadir}/vala/vapi/camel-1.2.vapi
 %{_datadir}/vala/vapi/libebook-%{apiver}.deps
 %{_datadir}/vala/vapi/libebook-%{apiver}.vapi
 %{_datadir}/vala/vapi/libebook-contacts-%{apiver}.deps