From f93bd4f626f4a506076754503972aa8fb4a524f1 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 2 Dec 2022 12:17:39 +0100
Subject: [PATCH] Update to 1.32.2

MM: Include the support for Dell DW5931e WWAN 5G(Intel FM350-GL)
Related: #2110564

MM: Include the FCC unLock support for Dell DW5931e WWAN 5G(Intel FM350-GL) and Dell DW5823e WWAN 4G (Intel 7650 R+)
Related: #2110569
---
 .gitignore  |  1 +
 libqmi.spec | 35 ++++++++++++++++++++++++-----------
 sources     |  2 +-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc6eb9b..311902c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libqmi-*.tar.xz
+/libqmi-1.32.2.tar.bz2
diff --git a/libqmi.spec b/libqmi.spec
index 5146929..18ebc36 100644
--- a/libqmi.spec
+++ b/libqmi.spec
@@ -1,20 +1,21 @@
 Name: libqmi
-Version: 1.30.2
-Release: 2%{?dist}
+Version: 1.32.2
+Release: 1%{?dist}
 Summary: Support library to use the Qualcomm MSM Interface (QMI) protocol
 License: LGPLv2+
 URL: http://freedesktop.org/software/libqmi
-Source: http://freedesktop.org/software/libqmi/%{name}-%{version}.tar.xz
+Source: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/%{version}/%{name}-%{version}.tar.bz2
 
+BuildRequires: meson >= 0.53
 BuildRequires: gcc
-BuildRequires: glib2-devel >= 2.48.0
+BuildRequires: glib2-devel >= 2.56
 BuildRequires: gobject-introspection-devel
 BuildRequires: gtk-doc
 BuildRequires: pkgconfig(gudev-1.0) >= 147
 BuildRequires: libmbim-devel >= 1.18.0
 BuildRequires: libqrtr-glib-devel
-BuildRequires: make
 BuildRequires: python3
+BuildRequires: help2man
 
 %description
 This package contains the libraries that make it easier to use QMI functionality
@@ -24,7 +25,7 @@ from applications that use glib.
 %package devel
 Summary: Header files for adding QMI support to applications that use glib
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: glib2-devel
+Requires: glib2-devel%{?_isa}
 Requires: pkgconfig
 
 %description devel
@@ -47,14 +48,23 @@ from the command line.
 
 
 %build
-%configure --disable-static --enable-gtk-doc --enable-mbim-qmux
-%{make_build} V=1
+# Let's avoid BuildRequiring bash-completion because it changes behavior
+# of shell, at least until the .pc file gets into the -devel subpackage.
+# We'll just install the bash-completion file ourselves.
+%meson -Dgtk_doc=true -Dbash_completion=false
+%meson_build
 
 
 %install
-%make_install
-find %{buildroot}%{_datadir}/gtk-doc |xargs touch --reference configure.ac
+%meson_install
+find %{buildroot}%{_datadir}/gtk-doc |xargs touch --reference meson.build
 find %{buildroot} -type f -name "*.la" -delete
+mkdir -p %{buildroot}%{_datadir}/bash-completion
+cp -a src/qmicli/qmicli %{buildroot}%{_datadir}/bash-completion
+
+
+%check
+%meson_test
 
 
 %ldconfig_scriptlets
@@ -62,7 +72,7 @@ find %{buildroot} -type f -name "*.la" -delete
 
 %files
 %license COPYING.LIB
-%doc NEWS AUTHORS README
+%doc NEWS AUTHORS README.md
 %{_libdir}/libqmi-glib.so.*
 %{_libdir}/girepository-1.0/Qmi-1.0.typelib
 
@@ -86,6 +96,9 @@ find %{buildroot} -type f -name "*.la" -delete
 
 
 %changelog
+* Tue Nov 22 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.32.2-1
+- Update to 1.32.2
+
 * Wed Dec 15 2021 Ana Cabral <acabral@redhat.com> - 1.30.2-2
 - Include libqrtr build dependency (rh #2032807)
 
diff --git a/sources b/sources
index 7449251..828220e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libqmi-1.30.2.tar.xz) = e34e9cb4b49df6eac555e6493cfc89aaf6f9be3fbfb0b19a5fb6b69c81768fda499a6438b1a4f39b84a350899721c6a04c4195985077ac35da0036794bc59367
+SHA512 (libqmi-1.32.2.tar.bz2) = c09b7633e7260a50717eb80d0eadd6237c49804cc9683e8256f959811a896e2caeeadb1247e1db9664fd171cb084e083876a360a34ec25a47e855e08dbef1f62