diff --git a/modem-manager-gui.spec b/modem-manager-gui.spec index e8a1a43..67a0ec8 100644 --- a/modem-manager-gui.spec +++ b/modem-manager-gui.spec @@ -4,7 +4,7 @@ Summary(de): Grafische Oberfläche für ModemManager Summary(ru): Графический интерфейс для демона ModemManager Version: 0.0.19.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3 URL: https://linuxonly.ru/page/modem-manager-gui @@ -13,6 +13,7 @@ Source0: http://download.tuxfamily.org/gsf/source/modem-manager-gui-%{vers # Avoid string truncation Patch0: mmgui-fix-strncpy-usage.patch +%global build_using_meson 0 %global with_ofono 0 BuildRequires: gcc @@ -26,10 +27,15 @@ BuildRequires: itstool BuildRequires: libappindicator-gtk3-devel >= 0.4.92 BuildRequires: libappstream-glib BuildRequires: libnotify-devel >= 0.7.5 -BuildRequires: meson BuildRequires: pkgconfig BuildRequires: po4a +%if %{build_using_meson} +BuildRequires: meson +%else +BuildRequires: make +%endif + %if %{with_ofono} BuildRequires: ofono-devel >= 1.09 %endif @@ -126,16 +132,28 @@ Plugin for %{name} allowing to use ofono as the modem manager. %patch0 -p1 sed -e "s/meson_version: '>=0.37'/meson_version: '>=0.38'/" -i meson.build + %build -%meson -%meson_build +%if %{build_using_meson} + %meson + %meson_build +%else + %configure + %make_build +%endif + %install -# Override the system RPM macto to force a single-threaded install process. +# Override the system RPM macro to force a single-threaded install process. # This is a workaround around bugs in /usr/bin/itstool, which cause it # to behave non-deterministic during pararell builds. %global _smp_mflags -j1 -%meson_install + +%if %{build_using_meson} + %meson_install +%else + %make_install +%endif %find_lang %{name} --with-gnome @@ -146,6 +164,11 @@ sed -e 's|/usr/bin/env python3|/usr/bin/python3|' \ # Remove plugin for obsolete ModemManager version rm %{buildroot}/%{_libdir}/%{name}/modules/libmodmm_mm06.so +%if !%{with_ofono} + find %{buildroot} -name '*ofono*' -exec rm '{}' ';' +%endif + + %check appstream-util validate --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -188,6 +211,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Mar 09 2019 Artur Iwicki - 0.0.19.1-7 +- Use make instead of meson for building + * Tue Feb 05 2019 Artur Iwicki - 0.0.19.1-6 - Force the installation phase to be single-threaded