!1 添加libqmi包

Merge pull request !1 from xhming/master
2019-11-30 17:50:08 +08:00 · 2019-11-30 17:50:08 +08:00 · f1e58cbb0c
commit f1e58cbb0c
parent a44f8a3cbd 6ac87b0ec8
5 changed files with 101 additions and 75 deletions
--- a/README.en.md
+++ b/README.en.md
@ -1,36 +0,0 @@
-# libqmi
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/README.md
+++ b/README.md
@ -1,39 +0,0 @@
-# libqmi
-
-#### 介绍
-{**以下是码云平台说明，您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- 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.spec
+++ b/libqmi.spec
@ -0,0 +1,73 @@
+Name:          libqmi
+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
+
+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
+
+%description
+Libqmi is a glib-based library for talking to WWAN modems and devices which
+speak the Qualcomm MSM Interface (QMI) protocol.
+
+%package       devel
+Summary:       Libraries and header files for libqmi development
+Requires:      libqmi = %{version}-%{release} glib2-devel pkgconfig
+
+%description   devel
+This package contains the header and pkg-config files for development
+applications using QMI functionality from applications that use glib.
+
+%package_help
+
+%prep
+%autosetup -p1
+
+%build
+%configure --disable-static --enable-gtk-doc --enable-mbim-qmux
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'         libtool
+
+LD_LIBRARY_PATH="$PWD/src/libqmi-glib/.libs" %make_build V=1
+
+%install
+%make_install
+find %{buildroot}%{_datadir}/gtk-doc | xargs touch --reference configure.ac
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%license COPYING
+%{_bindir}/qmi*
+%{_libdir}/libqmi-glib.so.*
+%{_datadir}/bash-completion
+%{_libexecdir}/qmi-proxy
+
+%files devel
+%dir %{_includedir}/libqmi-glib
+%dir %{_datadir}/gtk-doc/html/libqmi-glib
+%{_includedir}/libqmi-glib/*.h
+%{_libdir}/pkgconfig/qmi-glib.pc
+%{_libdir}/libqmi-glib.so
+%{_datadir}/gtk-doc/html/libqmi-glib/*
+%exclude %{_libdir}/libqmi-glib.la
+
+%files help
+%doc NEWS AUTHORS README
+%{_mandir}/man1/*
+
+%changelog
+* Fri Nov 29 2019 Lijin Yang <yanglijin@huawei.com> - 1.20.0-4
+- init package
+
+