Accepting request 950278 from GNOME:Next

Pretty it up for factory submission

OBS-URL: https://build.opensuse.org/request/show/950278
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/calls?expand=0&rev=3

calls.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 31 18:11:37 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Tidy the spec up even more, use generic BuildRequires for
+  compilers needed, update URL to current home.
+- Run selective tests only.
+- Exclude packaging of ofono plugins, upstream is gone/defunct.
+
 -------------------------------------------------------------------
 Wed Jan 12 20:36:59 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

calls.spec

@@ -18,14 +18,16 @@
 
 Name:           calls
 Version:        41.1
-Release:        0%{?dist}
+Release:        0
 Summary:        A phone dialer and call handler
 License:        GPL-3.0-only AND MIT
-URL:            https://source.puri.sm/Librem5/calls
+URL:            https://gitlab.gnome.org/GNOME/calls
 Source0:        %{name}-%{version}.tar.xz
+
 BuildRequires:  appstream-glib
 BuildRequires:  desktop-file-utils
-BuildRequires:  gcc-c++
+BuildRequires:  c++_compiler
+BuildRequires:  c_compiler
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  meson
 BuildRequires:  sofia-sip
@@ -48,7 +50,6 @@ BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libpeas-1.0)
 BuildRequires:  pkgconfig(mm-glib)
 BuildRequires:  pkgconfig(sofia-sip-ua-glib)
-Recommends:     %{name}-lang
 
 %description
 %{summary}.
@@ -56,10 +57,11 @@ Recommends:     %{name}-lang
 %lang_package
 
 %prep
-%autosetup -n %{name}-%{version}/
+%autosetup
 
 %build
-%meson
+%meson \
+	%{nil}
 %meson_build
 
 %install
@@ -68,23 +70,38 @@ Recommends:     %{name}-lang
 %find_lang %{name}
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/sm.puri.Calls.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Calls.metainfo.xml
-desktop-file-validate %{buildroot}/%{_datadir}/applications/sm.puri.Calls.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Calls.desktop
-#LC_ALL=C.UTF-8 xvfb-run sh <<'SH'
+
-#meson_test
+# Some tests are failing in the build environment, so we manually just run a handful for now.
-#SH
+LC_ALL=C.UTF-8 xvfb-run sh <<'SH'
+%meson_test manager plugins
+SH
 
 %files
 %license COPYING
-%{_sysconfdir}/xdg/autostart/sm.puri.Calls-daemon.desktop
+%doc NEWS README.md
-%{_bindir}/gnome-calls
+%{_sysconfdir}/xdg/autostart/org.gnome.Calls-daemon.desktop
-%{_libdir}/calls
+%{_bindir}/gnome-%{name}
-%{_datadir}/applications/*.desktop
+%dir %{_libdir}/%{name}
-%{_datadir}/icons/hicolor/*/*/*.svg
+%dir %{_libdir}/%{name}/plugins
-%{_datadir}/metainfo/*.metainfo.xml
+%dir %{_libdir}/%{name}/plugins/mm
-%dir %{_datadir}/glib-2.0/
+%dir %{_libdir}/%{name}/plugins/dummy
-%dir %{_datadir}/glib-2.0/schemas/
+%dir %{_libdir}/%{name}/plugins/sip
-%{_datadir}/glib-2.0/schemas/sm.puri.Calls.gschema.xml
+%{_libdir}/%{name}/plugins/mm/libmm.so
+%{_libdir}/%{name}/plugins/mm/mm.plugin
+%{_libdir}/%{name}/plugins/dummy/dummy.plugin
+%{_libdir}/%{name}/plugins/dummy/libdummy.so
+%{_libdir}/%{name}/plugins/sip/libsip.so
+%{_libdir}/%{name}/plugins/sip/sip.plugin
+# ofono is dead upstream so we exclude the plugins
+%exclude %{_libdir}/%{name}/plugins/ofono/libofono.so
+%exclude %{_libdir}/%{name}/plugins/ofono/ofono.plugin
+%{_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
 
 %files lang -f %{name}.lang