[packages/folks] - updated to 0.13.2

qboosh qboosh at pld-linux.org
Sat Mar 7 09:37:14 CET 2020 

commit 526c38c1b284e26326abd090d93e9df3d802d7b1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 7 09:38:11 2020 +0100

    - updated to 0.13.2

 folks.spec | 134 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 43 deletions(-)
---
diff --git a/folks.spec b/folks.spec
index 83e37cb..7c23f28 100644
--- a/folks.spec
+++ b/folks.spec
@@ -1,54 +1,71 @@
 #
 # Conditional build:
-%bcond_with	apidocs		# API documentation (currently built as devhelp part, not gtk-doc?)
-%bcond_without	vala		# do not build Vala API
-
+%bcond_with	apidocs		# API documentation (broken install: HTML for devhelp part, sources+HTML for gtk-doc?)
+%bcond_without	vala		# Vala API
+%bcond_without	bluez		# Bluez backend
+%bcond_without	evolution	# EDS (Evolution Data Server) backend
+%bcond_without	ofono		# oFono backend
+%bcond_without	telepathy	# Telepathy backend
+%bcond_without	zeitgeist	# ` Zeitgeist support in Telepathy backend
+%bcond_without	tracker		# Tracker backend
+
+%if %{without telepathy}
+%undefine	with_zeitgeist
+%endif
 Summary:	GObject contact aggregation library
 Summary(pl.UTF-8):	Biblioteka GObject do agregowania kontaktów
 Name:		folks
-Version:	0.13.1
-Release:	3
+Version:	0.13.2
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/folks/0.13/%{name}-%{version}.tar.xz
-# Source0-md5:	0038ec90db52ed7a82c93d98e227b078
+# Source0-md5:	e9e8d37bbd2b6405c5d23269d9df2d49
 Patch0:		%{name}-meson.patch
 Patch1:		%{name}-module.patch
 URL:		https://wiki.gnome.org/Projects/Folks
 BuildRequires:	dbus-devel
-BuildRequires:	dbus-glib-devel
-BuildRequires:	evolution-data-server-devel >= 3.13.2
+%{?with_telepathy:BuildRequires:	dbus-glib-devel}
+%if %{with bluez} || %{with evolution} || %{with ofono}
+# libebook for all; libebook-contacts, libedataserver, evolution-data-server for evolution
+BuildRequires:	evolution-data-server-devel >= 3.33.2
+%endif
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.44
 BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	libgee-devel >= 0.8.4
 BuildRequires:	libxml2-devel >= 2.0
-BuildRequires:	meson >= 0.49
+BuildRequires:	meson >= 0.51
 BuildRequires:	ncurses-devel
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig >= 1:0.21
 BuildRequires:	python3 >= 1:3.2
+%{?with_bluez:BuildRequires:	python3-dbusmock}
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	readline-devel
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	telepathy-glib-devel >= 0.19.9
-BuildRequires:	tracker-devel >= 2.0
+%{?with_telepathy:BuildRequires:	telepathy-glib-devel >= 0.19.9}
+%{?with_tracker:BuildRequires:	tracker-devel >= 2.0}
 %if %{with vala}
 BuildRequires:	vala >= 2:0.22.1
+%if %{with bluez} || %{with evolution} || %{with ofono}
 BuildRequires:	vala-evolution-data-server >= 3.33.2
+%endif
 BuildRequires:	vala-libgee >= 0.8.4
-BuildRequires:	vala-telepathy-glib >= 0.19.9
-BuildRequires:	vala-tracker >= 2.0
-BuildRequires:	vala-zeitgeist >= 0.9.14
+%{?with_telepathy:BuildRequires:	vala-telepathy-glib >= 0.19.9}
+%{?with_tracker:BuildRequires:	vala-tracker >= 2.0}
+%{?with_zeitgeist:BuildRequires:	vala-zeitgeist >= 0.9.14}
 %endif
 %{?with_apidocs:BuildRequires:	valadoc >= 0.3.1}
 BuildRequires:	xz
-BuildRequires:	zeitgeist-devel >= 0.9.14
+%{?with_zeitgeist:BuildRequires:	zeitgeist-devel >= 0.9.14}
+%if %{with bluez} || %{with evolution} || %{with ofono}
 Requires:	evolution-data-server-libs >= 3.33.2
+%endif
 Requires:	glib2 >= 1:2.44
 Requires:	libgee >= 0.8.4
-Requires:	telepathy-glib >= 0.19.9
-Requires:	tracker-libs >= 2.0
+%{?with_telepathy:Requires:	telepathy-glib >= 0.19.9}
+%{?with_tracker:Requires:	tracker-libs >= 2.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		abiver	45
@@ -68,11 +85,13 @@ Summary:	Development files for folks libraries
 Summary(pl.UTF-8):	Pliki programistyczne bibliotek folks
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%if %{with bluez} || %{with evolution} || %{with ofono}
 Requires:	evolution-data-server-devel >= 3.33.2
+%endif
 Requires:	glib2-devel >= 1:2.44
 Requires:	libgee-devel >= 0.8.4
-Requires:	telepathy-glib-devel >= 0.19.9
-Requires:	tracker-devel >= 2.0
+%{?with_telepathy:Requires:	telepathy-glib-devel >= 0.19.9}
+%{?with_tracker:Requires:	tracker-devel >= 2.0}
 
 %description devel
 Development files for folks libraries.
@@ -86,11 +105,13 @@ Summary(pl.UTF-8):	API folks dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	vala >= 2:0.22.1
+%if %{with bluez} || %{with evolution} || %{with ofono}
 Requires:	vala-evolution-data-server >= 3.33.2
+%endif
 Requires:	vala-libgee >= 0.8.4
-Requires:	vala-telepathy-glib >= 0.19.9
-Requires:	vala-tracker >= 2.0
-%if "%{_rpmversion}" >= "5"
+%{?with_telepathy:Requires:	vala-telepathy-glib >= 0.19.9}
+%{?with_tracker:Requires:	vala-tracker >= 2.0}
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
@@ -107,9 +128,13 @@ API folks dla języka Vala.
 
 %build
 %meson build \
+	%{!?with_bluez:-Dbluez_backend=false} \
 	%{?with_apidocs:-Ddocs=true} \
-	-Dtracker_backend=true \
-	-Dzeitgeist=true
+	%{!?with_evolution:-Deds_backend=false} \
+	%{!?with_ofono:-Dofono_backend=false} \
+	%{?with_tracker:-Dtracker_backend=true} \
+	%{!?with_telepathy:-Dtelepathy_backend=false} \
+	%{?with_zeitgeist:-Dzeitgeist=true}
 
 %ninja_build -C build
 
@@ -135,54 +160,71 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libfolks.so.25
 %attr(755,root,root) %{_libdir}/libfolks-dummy.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfolks-dummy.so.25
-%attr(755,root,root) %{_libdir}/libfolks-eds.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfolks-eds.so.25
-%attr(755,root,root) %{_libdir}/libfolks-telepathy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfolks-telepathy.so.25
-%attr(755,root,root) %{_libdir}/libfolks-tracker.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfolks-tracker.so.25
 %{_libdir}/girepository-1.0/Folks-0.6.typelib
 %{_libdir}/girepository-1.0/FolksDummy-0.6.typelib
-%{_libdir}/girepository-1.0/FolksEds-0.6.typelib
-%{_libdir}/girepository-1.0/FolksTelepathy-0.6.typelib
-%{_libdir}/girepository-1.0/FolksTracker-0.6.typelib
 %dir %{_libdir}/folks
 %dir %{_libdir}/folks/%{abiver}
 %dir %{_libdir}/folks/%{abiver}/backends
-%dir %{_libdir}/folks/%{abiver}/backends/bluez
-%attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/bluez/bluez.so
 %dir %{_libdir}/folks/%{abiver}/backends/dummy
 %attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/dummy/dummy.so
-%dir %{_libdir}/folks/%{abiver}/backends/eds
-%attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/eds/eds.so
 %dir %{_libdir}/folks/%{abiver}/backends/key-file
 %attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/key-file/key-file.so
+%if %{with bluez}
+%dir %{_libdir}/folks/%{abiver}/backends/bluez
+%attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/bluez/bluez.so
+%endif
+%if %{with ofono}
 %dir %{_libdir}/folks/%{abiver}/backends/ofono
 %attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/ofono/ofono.so
+%endif
+%if %{with evolution}
+%attr(755,root,root) %{_libdir}/libfolks-eds.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfolks-eds.so.25
+%{_libdir}/girepository-1.0/FolksEds-0.6.typelib
+%dir %{_libdir}/folks/%{abiver}/backends/eds
+%attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/eds/eds.so
+%endif
+%if %{with telepathy}
+%attr(755,root,root) %{_libdir}/libfolks-telepathy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfolks-telepathy.so.25
+%{_libdir}/girepository-1.0/FolksTelepathy-0.6.typelib
 %dir %{_libdir}/folks/%{abiver}/backends/telepathy
 %attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/telepathy/telepathy.so
+%endif
+%if %{with tracker}
+%attr(755,root,root) %{_libdir}/libfolks-tracker.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfolks-tracker.so.25
+%{_libdir}/girepository-1.0/FolksTracker-0.6.typelib
 %dir %{_libdir}/folks/%{abiver}/backends/tracker
 %attr(755,root,root) %{_libdir}/folks/%{abiver}/backends/tracker/tracker.so
+%endif
+%{_datadir}/GConf/gsettings/folks.convert
 %{_datadir}/glib-2.0/schemas/org.freedesktop.folks.gschema.xml
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfolks.so
 %attr(755,root,root) %{_libdir}/libfolks-dummy.so
-%attr(755,root,root) %{_libdir}/libfolks-eds.so
-%attr(755,root,root) %{_libdir}/libfolks-telepathy.so
-%attr(755,root,root) %{_libdir}/libfolks-tracker.so
 %{_datadir}/gir-1.0/Folks-0.6.gir
 %{_datadir}/gir-1.0/FolksDummy-0.6.gir
-%{_datadir}/gir-1.0/FolksEds-0.6.gir
-%{_datadir}/gir-1.0/FolksTelepathy-0.6.gir
-%{_datadir}/gir-1.0/FolksTracker-0.6.gir
 %{_includedir}/folks
 %{_pkgconfigdir}/folks.pc
 %{_pkgconfigdir}/folks-dummy.pc
+%if %{with evolution}
+%attr(755,root,root) %{_libdir}/libfolks-eds.so
+%{_datadir}/gir-1.0/FolksEds-0.6.gir
 %{_pkgconfigdir}/folks-eds.pc
+%endif
+%if %{with telepathy}
+%attr(755,root,root) %{_libdir}/libfolks-telepathy.so
+%{_datadir}/gir-1.0/FolksTelepathy-0.6.gir
 %{_pkgconfigdir}/folks-telepathy.pc
+%endif
+%if %{with tracker}
+%attr(755,root,root) %{_libdir}/libfolks-tracker.so
+%{_datadir}/gir-1.0/FolksTracker-0.6.gir
 %{_pkgconfigdir}/folks-tracker.pc
+%endif
 
 %if %{with vala}
 %files -n vala-folks
@@ -191,10 +233,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/folks.vapi
 %{_datadir}/vala/vapi/folks-dummy.deps
 %{_datadir}/vala/vapi/folks-dummy.vapi
+%if %{with evolution}
 %{_datadir}/vala/vapi/folks-eds.deps
 %{_datadir}/vala/vapi/folks-eds.vapi
+%endif
+%if %{with telepathy}
 %{_datadir}/vala/vapi/folks-telepathy.deps
 %{_datadir}/vala/vapi/folks-telepathy.vapi
+%endif
+%if %{with tracker}
 %{_datadir}/vala/vapi/folks-tracker.deps
 %{_datadir}/vala/vapi/folks-tracker.vapi
 %endif
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/folks.git/commitdiff/526c38c1b284e26326abd090d93e9df3d802d7b1

More information about the pld-cvs-commit mailing list