5 changed files with 33 additions and 22 deletions
--- a/bugfix-fix-glib-upgraded-to-propagate-propagate-propagate-in-propagate.patch
+++ b/bugfix-fix-glib-upgraded-to-propagate-propagate-propagate-in-propagate.patch
@ -0,0 +1,28 @@
+diff -uNrp a/src/qmicli/qmicli-dms.c b/src/qmicli/qmicli-dms.c
+--- a/src/qmicli/qmicli-dms.c   2018-01-20 13:17:41.000000000 +0000
+++ b/src/qmicli/qmicli-dms.c   2018-12-16 18:06:11.907289475 +0000
+@@ -2697,9 +2697,9 @@ static void
+ get_stored_image_result_free (GetStoredImageResult *result)
+ {
+     if (result) {
+-        g_clear_pointer (&result->modem_unique_id, (GDestroyNotify)g_array_unref);
+        g_clear_pointer (&result->modem_unique_id, g_array_unref);
+         g_free (result->modem_build_id);
+-        g_clear_pointer (&result->pri_unique_id, (GDestroyNotify)g_array_unref);
+        g_clear_pointer (&result->pri_unique_id, g_array_unref);
+         g_free (result->pri_build_id);
+         g_slice_free (GetStoredImageResult, result);
+     }
+@@ -3161,10 +3161,10 @@ typedef struct {
+ static void
+ set_firmware_preference_context_clear (SetFirmwarePreferenceContext *firmware_preference_ctx)
+ {
+-    g_clear_pointer (&firmware_preference_ctx->modem_image_id.unique_id, (GDestroyNotify) g_array_unref);
+    g_clear_pointer (&firmware_preference_ctx->modem_image_id.unique_id, g_array_unref);
+     g_free (firmware_preference_ctx->modem_image_id.build_id);
+
+-    g_clear_pointer (&firmware_preference_ctx->pri_image_id.unique_id, (GDestroyNotify) g_array_unref);
+    g_clear_pointer (&firmware_preference_ctx->pri_image_id.unique_id, g_array_unref);
+     g_free (firmware_preference_ctx->pri_image_id.build_id);
+ }
+
--- a/libqmi-1.20.0.tar.xz
+++ b/libqmi-1.20.0.tar.xz
--- a/libqmi-1.26.2.tar.xz
+++ b/libqmi-1.26.2.tar.xz
--- a/libqmi.spec
+++ b/libqmi.spec
@ -1,12 +1,14 @@
 Name:          libqmi
-Version:       1.26.2
-Release:       3
+Version:       1.20.0
+Release:       4
 License:       LGPLv2+ and GPLv2+
 Summary:       A glib-based library to use the Qualcomm MSM Interface (QMI) protocol
 URL:           http://freedesktop.org/software/libqmi
 Source0:       http://freedesktop.org/software/libqmi/libqmi-%{version}.tar.xz

-BuildRequires: glib2-devel >= 2.32.0 libgudev-devel >= 147 libmbim-devel >= 1.18.0 python3 gtk-doc gcc
+Patch6000:     bugfix-fix-glib-upgraded-to-propagate-propagate-propagate-in-propagate.patch
+
+BuildRequires: glib2-devel >= 2.32.0 libgudev-devel >= 147 libmbim-devel >= 1.14.0 python2 >= 2.7 gtk-doc
 Provides:      libqmi-utils = %{version}-%{release}
 Obsoletes:     libqmi-utils < 1.20.0.4

@ -65,21 +67,6 @@ find %{buildroot}%{_datadir}/gtk-doc | xargs touch --reference configure.ac
 %{_mandir}/man1/*

 %changelog
-* Mon Jun 28 2021 liuyumeng <liuyumeng5@huawei.com> - 1.26.2-3
- update libmbim-devel version from 1.14.0 to 1.18.0
-
-* Tue Jun 08 2021 wulei <wulei80@huawei.com> - 1.26.2-2
- fixes failed: error: no acceptable C compiler found in $PATH
-
-* Tue Jul 28 2020 cuibaobao <cuibaobao1@huawei.com> - 1.26.2-1
- update to 1.26.2
-
-* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.20.0-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add patch to modify build err
-
 * Fri Nov 29 2019 Lijin Yang <yanglijin@huawei.com> - 1.20.0-4
 - init package

--- a/libqmi.yaml
+++ b/libqmi.yaml
@ -1,4 +0,0 @@
-version_control: github
-src_repo:  freedesktop/libqmi
-tag_prefix: ^
-seperator: .