X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=e7838c800c31d01886b3c7c7de6b6eb66722467e;hp=fa46fdb1c8b37a4c71ab1ea14573b97e8581318e;hb=42a2ef57874e53b0b67ef47a70ef43b83ee6f503;hpb=e65ba601d8df499f87022532d06132d2c5d46f88

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index fa46fdb..e7838c8 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,35 +1,36 @@
 #
 # 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.12
+%define		basever		3.18
 %define		apiver		1.2
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	3.12.9
+Version:	3.18.2
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.12/%{name}-%{version}.tar.xz
-# Source0-md5:	0310c186afbf417e05e98072e8fd44af
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.18/%{name}-%{version}.tar.xz
+# Source0-md5:	bd6b559fc7fa4bf10f2f70d9afad8f83
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gcr-devel >= 3.4.0
-BuildRequires:	gettext-devel >= 0.18.1
-BuildRequires:	glib2-devel >= 1:2.36.0
+BuildRequires:	gcr-ui-devel >= 3.4.0
+BuildRequires:	gettext-tools >= 0.18.1
+BuildRequires:	glib2-devel >= 1:2.40.0
 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.2.0
+BuildRequires:	gtk+3-devel >= 3.10.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	intltool >= 0.40.0
@@ -47,20 +48,19 @@ 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.14.0}
+%{?with_vala:BuildRequires:	vala >= 2:0.22.0}
 BuildRequires:	xz
 BuildRequires:	zlib-devel
-Requires(post,postun):	glib2 >= 1:2.34.0
+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.2.0
+Requires:	gtk+3 >= 3.10.0
 Requires:	libgdata >= 0.15.1
 Requires:	libgweather >= 3.8
 # sr@Latn vs. sr@latin
@@ -126,12 +126,13 @@ Summary:	Evolution Data Server library
 Summary(pl.UTF-8):	Biblioteka Evolution Data Server
 Group:		X11/Libraries
 Requires:	gcr-libs >= 3.4.0
-Requires:	glib2 >= 1:2.36.0
+Requires:	gcr-ui >= 3.4.0
+Requires:	glib2 >= 1:2.40.0
 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.
@@ -145,7 +146,8 @@ Summary(pl.UTF-8):	Pliki programistyczne serwera danych evolution
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gcr-devel >= 3.4.0
-Requires:	glib2-devel >= 1:2.36.0
+Requires:	gcr-ui-devel >= 3.4.0
+Requires:	glib2-devel >= 1:2.40.0
 %{?with_kerberos5:Requires:	heimdal-devel}
 Requires:	libgdata-devel >= 0.15.1
 Requires:	libical-devel >= 0.43
@@ -154,7 +156,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
@@ -181,6 +183,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.
@@ -193,7 +198,7 @@ Summary:	Evolution data server API for Vala language
 Summary(pl.UTF-8):	API serwera danych Evolution dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	vala >= 2:0.14.0
+Requires:	vala >= 2:0.22.0
 
 %description -n vala-evolution-data-server
 Evolution data server API for Vala language.
@@ -204,9 +209,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}
@@ -216,28 +218,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
 
@@ -254,7 +246,8 @@ install -d $RPM_BUILD_ROOT%{schemadir}
 
 cp -p addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{camel-providers,calendar-backends,addressbook-backends,registry-modules}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{camel-providers,calendar-backends,addressbook-backends,credential-modules,registry-modules}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}-%{basever}
@@ -286,12 +279,15 @@ fi
 %doc AUTHORS ChangeLog NEWS* README
 %attr(755,root,root) %{_libexecdir}/camel-index-control-%{apiver}
 %attr(755,root,root) %{_libexecdir}/camel-lock-helper-%{apiver}
+%attr(755,root,root) %{_libexecdir}/evolution-addressbook-factory-subprocess
 %attr(755,root,root) %{_libexecdir}/evolution-addressbook-factory
+%attr(755,root,root) %{_libexecdir}/evolution-calendar-factory-subprocess
 %attr(755,root,root) %{_libexecdir}/evolution-calendar-factory
 %attr(755,root,root) %{_libexecdir}/evolution-scan-gconf-tree-xml
 %attr(755,root,root) %{_libexecdir}/evolution-source-registry
 %attr(755,root,root) %{_libexecdir}/evolution-user-prompter
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libedbus-private.so
 %dir %{_libdir}/%{name}/addressbook-backends
 %attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendfile.so
 %attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendgoogle.so
@@ -316,6 +312,8 @@ fi
 %{_libdir}/%{name}/camel-providers/libcamelsendmail.urls
 %attr(755,root,root) %{_libdir}/%{name}/camel-providers/libcamelsmtp.so
 %{_libdir}/%{name}/camel-providers/libcamelsmtp.urls
+%dir %{_libdir}/%{name}/credential-modules
+%attr(755,root,root) %{_libdir}/%{name}/credential-modules/module-credentials-goa.so
 %dir %{_libdir}/evolution-data-server/registry-modules
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-cache-reaper.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-gnome-online-accounts.so
@@ -341,6 +339,7 @@ fi
 %{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.addressbook.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.gschema.xml
 
 %if %{with ldap}
 %files ldap
@@ -352,6 +351,7 @@ fi
 %if %{with uoa}
 %files uoa
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution-data-server/credential-modules/module-credentials-uoa.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-ubuntu-online-accounts.so
 %{_desktopdir}/evolution-data-server-uoa.desktop
 # XXX: which package should own these dirs?
@@ -378,21 +378,23 @@ 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.49
+%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.54
 %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.7
+%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.14
+%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.0
+%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.16
+%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.20
+%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.23
+%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.18
+%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
 %{_libdir}/girepository-1.0/EBookContacts-%{apiver}.typelib
 %{_libdir}/girepository-1.0/EDataServer-%{apiver}.typelib
@@ -407,6 +409,7 @@ fi
 %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so
 %attr(755,root,root) %{_libdir}/libedata-cal-%{apiver}.so
 %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so
+%attr(755,root,root) %{_libdir}/libedataserverui-%{apiver}.so
 %{_includedir}/evolution-data-server
 %{_pkgconfigdir}/camel-%{apiver}.pc
 %{_pkgconfigdir}/evolution-data-server-%{apiver}.pc
@@ -417,6 +420,7 @@ fi
 %{_pkgconfigdir}/libedata-book-%{apiver}.pc
 %{_pkgconfigdir}/libedata-cal-%{apiver}.pc
 %{_pkgconfigdir}/libedataserver-%{apiver}.pc
+%{_pkgconfigdir}/libedataserverui-%{apiver}.pc
 %{_datadir}/gir-1.0/EBook-%{apiver}.gir
 %{_datadir}/gir-1.0/EBookContacts-%{apiver}.gir
 %{_datadir}/gir-1.0/EDataServer-%{apiver}.gir
@@ -432,6 +436,7 @@ fi
 %{_libdir}/libedata-book-%{apiver}.a
 %{_libdir}/libedata-cal-%{apiver}.a
 %{_libdir}/libedataserver-%{apiver}.a
+%{_libdir}/libedataserverui-%{apiver}.a
 %endif
 
 %if %{with apidocs}