Compare commits

...

No commits in common. "c9-beta" and "c8" have entirely different histories.
c9-beta ... c8

2 changed files with 53 additions and 54 deletions

View File

@ -0,0 +1,24 @@
From b963eff93ec9f3c8d282ff1cd8f7b019f4aed82a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 12 Dec 2022 07:43:29 +0100
Subject: [PATCH] Disable docs check
This fails if we're disabling qrtr.
---
docs/reference/libqmi-glib/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build
index c07454a..54b4262 100644
--- a/docs/reference/libqmi-glib/meson.build
+++ b/docs/reference/libqmi-glib/meson.build
@@ -77,5 +77,5 @@ gnome.gtkdoc(
fixxref_args: fixxref_args,
content_files: [sections_txt, version_xml],
install: true,
- check: true,
+ check: false,
)
--
2.38.1

View File

@ -1,10 +1,17 @@
%if 0%{?fedora} || 0%{?rhel} >= 9
%bcond_without qrtr
%else
%bcond_with qrtr
%endif
Name: libqmi Name: libqmi
Version: 1.32.2 Version: 1.32.2
Release: 1%{?dist} Release: 3%{?dist}
Summary: Support library to use the Qualcomm MSM Interface (QMI) protocol Summary: Support library to use the Qualcomm MSM Interface (QMI) protocol
License: LGPLv2+ License: LGPLv2+
URL: http://freedesktop.org/software/libqmi URL: http://freedesktop.org/software/libqmi
Source: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/%{version}/%{name}-%{version}.tar.bz2
Patch0: 0001-Disable-docs-check.patch
BuildRequires: meson >= 0.53 BuildRequires: meson >= 0.53
BuildRequires: gcc BuildRequires: gcc
@ -13,7 +20,9 @@ BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: pkgconfig(gudev-1.0) >= 147 BuildRequires: pkgconfig(gudev-1.0) >= 147
BuildRequires: libmbim-devel >= 1.18.0 BuildRequires: libmbim-devel >= 1.18.0
%if %{with qrtr}
BuildRequires: libqrtr-glib-devel BuildRequires: libqrtr-glib-devel
%endif
BuildRequires: python3 BuildRequires: python3
BuildRequires: help2man BuildRequires: help2man
@ -51,8 +60,14 @@ from the command line.
# Let's avoid BuildRequiring bash-completion because it changes behavior # Let's avoid BuildRequiring bash-completion because it changes behavior
# of shell, at least until the .pc file gets into the -devel subpackage. # of shell, at least until the .pc file gets into the -devel subpackage.
# We'll just install the bash-completion file ourselves. # We'll just install the bash-completion file ourselves.
%meson -Dgtk_doc=true -Dbash_completion=false %meson -Dgtk_doc=true -Dbash_completion=false \
%if %{with qrtr}
-Dqrtr=true
%else
-Dqrtr=false
%endif
%meson_build %meson_build
%ninja_build -C %{_vpath_builddir} libqmi-glib-doc
%install %install
@ -96,67 +111,27 @@ cp -a src/qmicli/qmicli %{buildroot}%{_datadir}/bash-completion
%changelog %changelog
* Tue Nov 22 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.32.2-1 * Mon Dec 12 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.32.2-3
- Update to 1.32.2 - Update to 1.32.2
- Build without QRTR
* Wed Dec 15 2021 Ana Cabral <acabral@redhat.com> - 1.30.2-2 * Fri Oct 1 2021 Ana Cabral <acabral@redhat.com> - 1.30.2-1
- Include libqrtr build dependency (rh #2032807) - Upgrade to 1.30.2
* Tue Sep 07 2021 Wen Liang <wenliang@redhat.com> - 1.30.2-1 * Mon Jul 19 2021 Thomas Haller <thaller@redhat.com> - 1.24.0-3
- Update to 1.30.2 - fix crash in qmi_endpoint_is_open() (rh #1976888)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.26.8-4 * Mon Jul 19 2021 Thomas Haller <thaller@redhat.com> - 1.24.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - fix crash and detect QMI port over smdpkt subsystem (rh #1976886)
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.26.8-3 * Wed Oct 16 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.24.0-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Jan 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.26.8-1
- Update to 1.26.8
* Tue Nov 3 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.26.6-1
- Update to 1.26.6
* Fri Aug 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.26.4-1
- Update to 1.26.4
* Mon Jul 27 2020 Peter Robinson <pbrobinson@fedoraproject.org>
- Update to 1.26.2
* Tue Mar 24 2020 Lubomir Rintel <lkundrak@v3.sk> - 1.24.8
- Update to 1.24.8
* Thu Mar 5 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1.24.6-1
- Update to 1.24.6
- Spec cleanups, fix shipped licenses
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.24.0
- Update to 1.24.0 - Update to 1.24.0
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon May 06 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.22.4-1 * Mon May 06 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.22.4-1
- Update to 1.22.4 - Update to 1.22.4
* Thu Apr 11 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.22.2-1 * Fri Jun 29 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.20.0-4
- Update to 1.22.2 - Change to Python 3 as a build dependency
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.20.0-1
- Update to 1.22.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.20.0-3 * Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.20.0-3
- Update Python 2 dependency declarations to new packaging standards - Update Python 2 dependency declarations to new packaging standards
@ -166,7 +141,7 @@ cp -a src/qmicli/qmicli %{buildroot}%{_datadir}/bash-completion
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 22 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.20.0-1 * Mon Jan 22 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.20.0-1
- Update to 1.20.0 - Update to 1.18.0
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild