X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=96060dd926f64bc5e3856525029c055cdca0c781;hp=eb6b6f52099d9d7ec4d9cce75d1692baa9b8a1b7;hb=ce95bb19670502214eb31ccd472788d71d30c2cc;hpb=c902e485c1c71602cdbbb7ae125579aa5f82e1c1

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index eb6b6f5..96060dd 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -7,24 +7,24 @@
 %bcond_without	uoa		# single sign-on (aka Ubuntu Online Accounts)
 %bcond_without	vala		# do not build Vala API
 
-%define		basever		3.10
+%define		basever		3.12
 %define		apiver		1.2
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	3.10.4
+Version:	3.12.11
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.10/%{name}-%{version}.tar.xz
-# Source0-md5:	62b365fa50f13a0be85eec67115742c8
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.12/%{name}-%{version}.tar.xz
+# Source0-md5:	a05df58de484bb6ff6fe23e3eee71db3
 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.34.0
+BuildRequires:	gettext-tools >= 0.18.1
+BuildRequires:	glib2-devel >= 1:2.36.0
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gnome-online-accounts-devel >= 3.8.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
@@ -35,12 +35,13 @@ BuildRequires:	gtk+3-devel >= 3.2.0
 BuildRequires:	intltool >= 0.40.0
 %{?with_uoa:BuildRequires:	json-glib-devel}
 %{?with_uoa:BuildRequires:	libaccounts-glib-devel >= 1.4}
-BuildRequires:	libgdata-devel >= 0.10.0
+BuildRequires:	libgdata-devel >= 0.15.1
 BuildRequires:	libgweather-devel >= 3.8
 BuildRequires:	libical-devel >= 0.43
+BuildRequires:	libicu-devel
 BuildRequires:	libsecret-devel >= 0.5
 %{?with_uoa:BuildRequires:	libsignon-glib-devel >= 1.8}
-BuildRequires:	libsoup-devel >= 2.40.3
+BuildRequires:	libsoup-devel >= 2.42.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.31
@@ -53,14 +54,14 @@ BuildRequires:	rpmbuild(macros) >= 1.304
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.5
 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:	%{name}-libs = %{version}-%{release}
 Requires:	gnome-online-accounts-libs >= 3.8.0
 Requires:	gtk+3 >= 3.2.0
-Requires:	libgdata >= 0.10.0
+Requires:	libgdata >= 0.15.1
 Requires:	libgweather >= 3.8
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
@@ -74,6 +75,36 @@ The Evolution data server for the calendar and addressbook.
 %description -l pl.UTF-8
 Serwer danych Evolution dla kalendarza i książki adresowej.
 
+%package ldap
+Summary:	LDAP support for Evolution data server
+Summary(pl.UTF-8):	Obsługa LDAP dla serwera danych Evolution
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description ldap
+LDAP support for Evolution data server (address book backend module).
+
+%description ldap -l pl.UTF-8
+Obsługa LDAP dla serwera danych Evolution (moduł dla książki
+adresowej).
+
+%package uoa
+Summary:	Ubuntu Online Accounts support for Evolution data server
+Summary(pl.UTF-8):	Obsługa Ubuntu Online Accounts dla serwera danych Evolution
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libaccounts-glib >= 1.4
+Requires:	libsignon-glib >= 1.8
+Requires:	rest >= 0.7
+
+%description uoa
+Ubuntu Online Accounts (single sign-on) support for Evolution data
+server.
+
+%description uoa -l pl.UTF-8
+Obsługa Ubuntu Online Accounts (pojedynczego logowania) dla serwera
+danych Evolution.
+
 %package -n openldap-schema-evolutionperson
 Summary:	evolutionperson LDAP schema
 Summary(pl.UTF-8):	Schemat LDAP evolutionperson
@@ -95,10 +126,10 @@ 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.34.0
+Requires:	glib2 >= 1:2.36.0
 Requires:	libical >= 0.43
 Requires:	libsecret >= 0.5
-Requires:	libsoup >= 2.40.3
+Requires:	libsoup >= 2.42.0
 Requires:	libxml2 >= 1:2.6.31
 Requires:	sqlite3 >= 3.5
 
@@ -114,12 +145,12 @@ 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.34.0
+Requires:	glib2-devel >= 1:2.36.0
 %{?with_kerberos5:Requires:	heimdal-devel}
-Requires:	libgdata-devel >= 0.10.0
+Requires:	libgdata-devel >= 0.15.1
 Requires:	libical-devel >= 0.43
 Requires:	libsecret-devel >= 0.5
-Requires:	libsoup-devel >= 2.40.3
+Requires:	libsoup-devel >= 2.42.0
 Requires:	libxml2-devel >= 1:2.6.31
 Requires:	nspr-devel >= 4
 Requires:	nss-devel >= 3
@@ -162,7 +193,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.
@@ -202,7 +233,6 @@ export LIBS
 	%{!?with_ldap:--with-openldap=no} \
 	--enable-smime \
 	--enable-ipv6 \
-	--enable-nntp \
 	%{__enable_disable apidocs gtk-doc} \
 	%{__enable_disable static_libs static} \
 	%{__enable_disable vala vala-bindings} \
@@ -222,7 +252,7 @@ install -d $RPM_BUILD_ROOT%{schemadir}
 	DESTDIR=$RPM_BUILD_ROOT \
 	HTML_DIR=%{_gtkdocdir}
 
-install addressbook/backends/ldap/evolutionperson.schema $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}/*.la
@@ -265,14 +295,12 @@ fi
 %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
-%if %{with ldap}
-%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendldap.so
-%endif
 %attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendwebdav.so
 %dir %{_libdir}/%{name}/calendar-backends
 %attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendcaldav.so
 %attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendcontacts.so
 %attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendfile.so
+%attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendgtasks.so
 %attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendhttp.so
 %attr(755,root,root) %{_libdir}/%{name}/calendar-backends/libecalbackendweather.so
 %dir %{_libdir}/%{name}/camel-providers
@@ -294,26 +322,47 @@ fi
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-google-backend.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-outlook-backend.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-owncloud-backend.so
+%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-secret-monitor.so
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-trust-prompt.so
-%if %{with uoa}
-%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-ubuntu-online-accounts.so
-%endif
 %attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/module-yahoo-backend.so
 
 %dir %{_libdir}/%{name}-%{basever}
-
 %dir %{_datadir}/%{name}
+%{_pixmapsdir}/%{name}
+
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service
+
+%{_datadir}/GConf/gsettings/evolution-data-server.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
+%{_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
+
 %if %{with ldap}
+%files ldap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/libebookbackendldap.so
 %{_datadir}/%{name}/evolutionperson.schema
 %endif
-%{_pixmapsdir}/%{name}
 
 %if %{with uoa}
+%files uoa
+%defattr(644,root,root,755)
+%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?
+%dir %{_datadir}/accounts
+%dir %{_datadir}/accounts/applications
 %{_datadir}/accounts/applications/evolution-data-server.application
+%dir %{_datadir}/accounts/service_types
 %{_datadir}/accounts/service_types/calendar.service-type
 %{_datadir}/accounts/service_types/contacts.service-type
 %{_datadir}/accounts/service_types/mail.service-type
+%dir %{_datadir}/accounts/services
 %{_datadir}/accounts/services/google-calendar.service
 %{_datadir}/accounts/services/google-contacts.service
 %{_datadir}/accounts/services/google-gmail.service
@@ -322,19 +371,6 @@ fi
 %{_datadir}/accounts/services/yahoo-mail.service
 %endif
 
-%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
-%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
-%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
-%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service
-
-%{_datadir}/GConf/gsettings/evolution-data-server.convert
-%{_datadir}/GConf/gsettings/libedataserver.convert
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
-%{_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
-
 %files -n openldap-schema-evolutionperson
 %defattr(644,root,root,755)
 %{schemadir}/evolutionperson.schema
@@ -342,7 +378,7 @@ 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.45
+%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.49
 %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.7
 %attr(755,root,root) %{_libdir}/libebook-%{apiver}.so.*.*.*
@@ -402,13 +438,7 @@ fi
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/camel
-%{_gtkdocdir}/libebackend
-%{_gtkdocdir}/libebook
-%{_gtkdocdir}/libebook-contacts
-%{_gtkdocdir}/libecal
-%{_gtkdocdir}/libedata-book
-%{_gtkdocdir}/libedata-cal
-%{_gtkdocdir}/libedataserver
+%{_gtkdocdir}/eds
 %endif
 
 %if %{with vala}