Update to 43.2

calls.spec

@@ -1,14 +1,19 @@
-%global libcall_ui_commit acfbb136bbf74514e0b9801ce6c1e8acf36350b6
+%global libcall_ui_commit 619dd91561ad470db3d0e0e263ebc35d787afd2e
 
-Name:		calls
-Version:	42.0
-Release:	1
-Summary:	A phone dialer and call handler
-License:	GPLv3+ and MIT
-URL:		https://gitlab.gnome.org/GNOME/calls
-Source0:        https://download.gnome.org/sources/calls/42/%{name}-%{version}.tar.xz
+Name:		    calls
+Version:	    43.2
+Release:	    1
+Summary:	    A phone dialer and call handler
+License:	    GPLv3+ and MIT
+URL:		    https://gitlab.gnome.org/GNOME/calls
+Source0:        https://download.gnome.org/sources/calls/43/%{name}-%{version}.tar.xz
+Source1:	    https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/%{libcall_ui_commit}/libcall-ui-%{libcall_ui_commit}.tar.gz
 
-BuildRequires:	gcc gcc-c++ meson cmake vala
+BuildRequires:	gcc
+BuildRequires:	meson
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	vala
 BuildRequires:	pkgconfig(libcallaudio-0.1)
 BuildRequires:	pkgconfig(gobject-2.0)
 BuildRequires:	pkgconfig(glib-2.0) >= 2.50.0
@@ -23,12 +28,12 @@ BuildRequires:	pkgconfig(mm-glib)
 BuildRequires:	pkgconfig(libfeedback-0.0)
 BuildRequires:	pkgconfig(gstreamer-1.0)
 BuildRequires:	gstreamer1-plugins-good-gtk
-BuildRequires:	sofia-sip-devel
+BuildRequires:	sofia-sip-glib-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	xorg-x11-server-Xvfb
 BuildRequires:	xorg-x11-xauth
 BuildRequires:	libappstream-glib
-BuildRequires:  libcmocka-devel libcmocka
+BuildRequires:  python3-docutils
 
 Requires: hicolor-icon-theme
 
@@ -36,7 +41,10 @@ Requires: hicolor-icon-theme
 A phone dialer and call handler.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -a1 -q -n %{name}-%{version}
+
+rm -rf subprojects/libcall-ui/*
+mv libcall-ui-%{libcall_ui_commit}/* subprojects/libcall-ui/
 
 %build
 %meson
@@ -57,37 +65,52 @@ rm %{buildroot}%{_datadir}/locale/pt/LC_MESSAGES/call-ui.mo
 rm %{buildroot}%{_datadir}/locale/sv/LC_MESSAGES/call-ui.mo
 rm %{buildroot}%{_datadir}/locale/gl/LC_MESSAGES/call-ui.mo
 rm %{buildroot}%{_datadir}/locale/it/LC_MESSAGES/call-ui.mo
-rm %{buildroot}%{_datadir}//locale/sl/LC_MESSAGES/call-ui.mo
-rm -rf %{buildroot}%{_libdir}/calls/plugins/ofono/
+rm %{buildroot}%{_datadir}/locale/sl/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/es/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/fi/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/he/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/ka/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/oc/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/sr/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/tr/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/el/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES/call-ui.mo
+rm %{buildroot}%{_datadir}/locale/hr/LC_MESSAGES/call-ui.mo
+rm -rf %{buildroot}%{_libdir}/calls/plugins/provider/ofono/
 
 %find_lang %{name}
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Calls.metainfo.xml
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Calls.desktop
+LC_ALL=C.UTF-8 xvfb-run sh <<'SH'
+%meson_test plugins
+SH
 
 %files -f %{name}.lang
 %doc README.md
 %license COPYING
 %{_sysconfdir}/xdg/autostart/org.gnome.Calls-daemon.desktop
 %{_bindir}/gnome-%{name}
-%dir %{_libdir}/calls
-%dir %{_libdir}/calls/plugins
-%dir %{_libdir}/calls/plugins/mm
-%dir %{_libdir}/calls/plugins/dummy
-%dir %{_libdir}/calls/plugins/sip
-%{_libdir}/calls/plugins/mm/libmm.so
-%{_libdir}/calls/plugins/mm/mm.plugin
-%{_libdir}/calls/plugins/dummy/dummy.plugin
-%{_libdir}/calls/plugins/dummy/libdummy.so
-%{_libdir}/calls/plugins/sip/libsip.so
-%{_libdir}/calls/plugins/sip/sip.plugin
+%{_libdir}/calls/plugins/provider/mm/libmm.so
+%{_libdir}/calls/plugins/provider/mm/mm.plugin
+%{_libdir}/calls/plugins/provider/dummy/dummy.plugin
+%{_libdir}/calls/plugins/provider/dummy/libdummy.so
+%{_libdir}/calls/plugins/provider/sip/libsip.so
+%{_libdir}/calls/plugins/provider/sip/sip.plugin
+%{_datadir}/dbus-1/services/org.gnome.Calls.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Calls.gschema.xml
 %{_datadir}/applications/org.gnome.Calls.desktop
 %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Calls.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Calls-symbolic.svg
 %{_datadir}/metainfo/org.gnome.Calls.metainfo.xml
+%{_mandir}/man1/gnome-calls.1*
 
 %changelog
+* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
+- Update to 43.2
+
 * Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0-1
 - Initial packaging