From c13f31179dc51f0cebbf4d1b366cae4e18d45160 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 7 Dec 2021 14:25:39 -0500
Subject: [PATCH] import libmbim-1.26.0-2.el9

---
 .gitignore         |  2 +-
 .libmbim.metadata  |  2 +-
 SPECS/libmbim.spec | 36 ++++++++++++++++++------------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index f772af3..2308e83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libmbim-1.24.4.tar.xz
+SOURCES/libmbim-1.26.0.tar.xz
diff --git a/.libmbim.metadata b/.libmbim.metadata
index 16ac6b1..803b304 100644
--- a/.libmbim.metadata
+++ b/.libmbim.metadata
@@ -1 +1 @@
-e020aac8f3203c6bb7bdb2b85c7cda33ca325fbd SOURCES/libmbim-1.24.4.tar.xz
+bd963a9e82da47d993272640ecf1ea8d3301d4e0 SOURCES/libmbim-1.26.0.tar.xz
diff --git a/SPECS/libmbim.spec b/SPECS/libmbim.spec
index d5bdaef..ffa64d7 100644
--- a/SPECS/libmbim.spec
+++ b/SPECS/libmbim.spec
@@ -1,25 +1,18 @@
-%global _hardened_build 1
-
 Name: libmbim
-Version: 1.24.4
-Release: 4%{?dist}
+Version: 1.26.0
+Release: 2%{?dist}
 Summary: Support library for the Mobile Broadband Interface Model protocol
 License: LGPLv2+
 URL: http://freedesktop.org/software/libmbim
 Source: http://freedesktop.org/software/libmbim/%{name}-%{version}.tar.xz
 
-BuildRequires: make
+BuildRequires: automake autoconf libtool
 BuildRequires: gcc
 BuildRequires: glib2-devel >= 2.48.0
-BuildRequires: pkgconfig
-BuildRequires: automake autoconf libtool
-%if 0%{?rhel} > 0 && 0%{?rhel} < 8
-BuildRequires: python
-%else
-BuildRequires: python3
-%endif
-BuildRequires: pkgconfig(gudev-1.0) >= 147
 BuildRequires: gtk-doc
+BuildRequires: make
+BuildRequires: pkgconfig
+BuildRequires: python3
 
 
 %description
@@ -39,6 +32,7 @@ applications using MBIM functionality from applications that use glib.
 %package utils
 Summary: Utilities to use the MBIM protocol from the command line
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Conflicts: %{name} < 1.26.0
 License: GPLv2+
 
 %description utils
@@ -71,25 +65,31 @@ make check
 %license COPYING.LIB
 %doc NEWS AUTHORS README
 %{_libdir}/libmbim-glib.so.4*
-%{_datadir}/bash-completion
-
 
 %files devel
 %{_includedir}/libmbim-glib/
 %{_libdir}/pkgconfig/mbim-glib.pc
 %{_libdir}/libmbim-glib.so
-%dir %{_datadir}/gtk-doc/html/libmbim-glib
-%{_datadir}/gtk-doc/html/libmbim-glib/*
+%{_datadir}/gtk-doc/html/libmbim-glib/
 
 %files utils
 %license COPYING
 %{_bindir}/mbimcli
 %{_bindir}/mbim-network
-%{_mandir}/man1/*
+%{_datadir}/bash-completion
 %{_libexecdir}/mbim-proxy
+%{_mandir}/man1/mbim*
 
 
 %changelog
+* Wed Sep 15 2021 Wen Liang <wenliang@redhat.com> - 1.26.0-2
+- Add Conflicts tag because the bash-completion scripts moved from the main package
+  to the utils sub package causing a file conflict on multilib systems between the
+  old 32 bit main package and the new 64 bit utils sub package.
+
+* Wed Sep  8 2021 Wen Liang <wenliang@redhat.com> - 1.26.0-1
+- Update to 1.26.0
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.24.4-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688