From c5372074532bbdde223f32d1c571da8fcfde59ffe9b39c3d4fc60460141a2305 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 Nov 2017 15:35:19 +0000 Subject: [PATCH] Accepting request 538291 from home:pluskalm:branches:network - Enable tests - Do not rely on env for python during build - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/538291 OBS-URL: https://build.opensuse.org/package/show/network/libmbim?expand=0&rev=25 --- libmbim.changes | 7 +++++++ libmbim.spec | 25 +++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/libmbim.changes b/libmbim.changes index 1311b21..d442622 100644 --- a/libmbim.changes +++ b/libmbim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 2 09:06:32 UTC 2017 - mpluskal@suse.com + +- Enable tests +- Do not rely on env for python during build +- Run spec-cleaner + ------------------------------------------------------------------- Thu Sep 7 15:06:56 UTC 2017 - zaitor@opensuse.org diff --git a/libmbim.spec b/libmbim.spec index dc37a3c..83462fa 100644 --- a/libmbim.spec +++ b/libmbim.spec @@ -21,15 +21,16 @@ Name: libmbim Version: 1.14.2 Release: 0 Summary: Mobile Interface Broadband Model (MBIM) protocol -License: GPL-2.0+ and LGPL-2.0+ +License: GPL-2.0+ AND LGPL-2.0+ Group: Productivity/Networking/System Url: http://www.freedesktop.org/wiki/Software/libmbim/ Source: http://www.freedesktop.org/software/libmbim/%{name}-%{version}.tar.xz +BuildRequires: pkgconfig +BuildRequires: python3 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gudev-1.0) >= 147 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libmbim is a glib-based library for talking to WWAN modems and devices @@ -56,11 +57,11 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol. %package -n mbimcli-bash-completion Summary: Bash completion for mbimcli -License: GPL-2.0+ and LGPL-2.0+ +License: GPL-2.0+ AND LGPL-2.0+ Group: Productivity/Networking/System -Supplements: packageand(%{name}:bash-completion) BuildRequires: bash-completion Requires: bash-completion +Supplements: packageand(%{name}:bash-completion) %description -n mbimcli-bash-completion This package contain de bash completion command for mbimcli tools. @@ -69,21 +70,24 @@ This package contain de bash completion command for mbimcli tools. %setup -q %build +# Do not rely on env for choosing python +sed -i "s|env python|python3|g" build-aux/mbim-codegen/* %configure \ - --with-udev \ - --disable-static + --with-udev \ + --disable-static make %{?_smp_mflags} %install %make_install -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print +find %{buildroot} -type f -name "*.la" -delete -print + +%check +make %{?_smp_mflags} check %post -n libmbim-glib4 -p /sbin/ldconfig - %postun -n libmbim-glib4 -p /sbin/ldconfig %files -%defattr(-,root,root) %doc README COPYING %{_bindir}/mbim-network %{_bindir}/mbimcli @@ -92,18 +96,15 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %{_mandir}/man1/mbimcli.1%{?ext_man} %files -n libmbim-glib4 -%defattr(-,root,root) %{_libdir}/libmbim-glib.so.* %files devel -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libmbim-glib/ %{_includedir}/libmbim-glib/ %{_libdir}/libmbim-glib.so %{_libdir}/pkgconfig/mbim-glib.pc %files -n mbimcli-bash-completion -%defattr(-,root,root) %{_datadir}/bash-completion/completions/mbimcli %changelog