Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
|
|
@ -1,48 +0,0 @@
|
|||
From cade7a759cfd98922de0bb96bfb29721d861e25e Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Tue, 13 Dec 2022 18:14:51 +0100
|
||||
Subject: [PATCH] libmm-glib,common-helpers: avoid using mm_new_iso8601_time()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It requires newer glib than we do:
|
||||
|
||||
../libmm-glib/mm-common-helpers.c: In function ‘mm_new_iso8601_time’:
|
||||
../libmm-glib/mm-common-helpers.c:1787:9: warning: ‘g_time_zone_new_offset’ is deprecated: Not available before 2.58 [-Wdeprecated-declarations]
|
||||
1787 | tz = g_time_zone_new_offset (offset_minutes * 60);
|
||||
| ^~
|
||||
In file included from /usr/include/glib-2.0/glib/gdatetime.h:33:
|
||||
/usr/include/glib-2.0/glib/gtimezone.h:67:25: note: declared here
|
||||
67 | GTimeZone * g_time_zone_new_offset (gint32 seconds);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Let's not use the routine as opposed to bumping our requirement so that
|
||||
we don't lose ability to build on CentOS 8.
|
||||
---
|
||||
libmm-glib/mm-common-helpers.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libmm-glib/mm-common-helpers.c b/libmm-glib/mm-common-helpers.c
|
||||
index de49136d..91371e96 100644
|
||||
--- a/libmm-glib/mm-common-helpers.c
|
||||
+++ b/libmm-glib/mm-common-helpers.c
|
||||
@@ -1783,8 +1783,14 @@ mm_new_iso8601_time (guint year,
|
||||
|
||||
if (have_offset) {
|
||||
g_autoptr(GTimeZone) tz = NULL;
|
||||
+ g_autofree gchar *identifier = NULL;
|
||||
|
||||
- tz = g_time_zone_new_offset (offset_minutes * 60);
|
||||
+ identifier = g_strdup_printf ("%c%02u:%02u:00",
|
||||
+ (offset_minutes >= 0) ? '+' : '-',
|
||||
+ ABS (offset_minutes) / 60,
|
||||
+ ABS (offset_minutes) % 60);
|
||||
+
|
||||
+ tz = g_time_zone_new (identifier);
|
||||
dt = g_date_time_new (tz, year, month, day, hour, minute, second);
|
||||
} else
|
||||
dt = g_date_time_new_utc (year, month, day, hour, minute, second);
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -1,9 +1,3 @@
|
|||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%bcond_without qrtr
|
||||
%else
|
||||
%bcond_with qrtr
|
||||
%endif
|
||||
|
||||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||
%global qmi_version %(pkg-config --modversion qmi-glib 2>/dev/null || echo bad)
|
||||
%global mbim_version %(pkg-config --modversion mbim-glib 2>/dev/null || echo bad)
|
||||
|
|
@ -16,9 +10,6 @@ License: GPLv2+
|
|||
URL: http://www.freedesktop.org/wiki/Software/ModemManager/
|
||||
Source: https://gitlab.com/linux-mobile-broadband/ModemManager/-/archive/%{version}/%{name}-%{version}.tar.bz2
|
||||
|
||||
# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/938
|
||||
Patch0: 0001-libmm-glib-common-helpers-avoid-using-mm_new_iso8601.patch
|
||||
|
||||
# For mbim-proxy and qmi-proxy
|
||||
Requires: libmbim-utils
|
||||
Requires: libqmi-utils
|
||||
|
|
@ -46,9 +37,7 @@ BuildRequires: gtk-doc
|
|||
BuildRequires: libgudev1-devel >= 232
|
||||
BuildRequires: libmbim-devel >= 1.28.0
|
||||
BuildRequires: libqmi-devel >= 1.32.0
|
||||
%if %{with qrtr}
|
||||
BuildRequires: libqrtr-glib-devel >= 1.0.0
|
||||
%endif
|
||||
BuildRequires: make
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-devel >= 209
|
||||
|
|
@ -117,11 +106,6 @@ autoreconf -vif
|
|||
--with-mbim=yes \
|
||||
%ifarch aarch64
|
||||
--enable-plugin-qcom-soc \
|
||||
%endif
|
||||
%if %{with qrtr}
|
||||
--with-qrtr \
|
||||
%else
|
||||
--without-qrtr \
|
||||
%endif
|
||||
--disable-static \
|
||||
--with-polkit=permissive \
|
||||
|
|
@ -196,33 +180,109 @@ find %{buildroot} -type f -name "*.la" -delete
|
|||
* Tue Nov 22 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.20.2-1
|
||||
- Update to 1.20.2
|
||||
|
||||
* Tue Oct 1 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-1
|
||||
- Upgrade to 1.18.2 release
|
||||
* Wed Dec 15 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-3
|
||||
- Rebuild to update libqmi's libqrtr support (rh #2032807)
|
||||
|
||||
* Tue Apr 20 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.10.8-4
|
||||
- Fix crash when modem goes away during a connection attempt (rh #1936416)
|
||||
* Fri Dec 10 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-2
|
||||
- Include libqrtr-glib build dependency (rh #1996716)
|
||||
|
||||
* Wed Feb 24 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.10.8-3
|
||||
- Rebuild to fix multilib conflicts (rh #1853161)
|
||||
* Thu Oct 7 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-1
|
||||
- Upgrade to 1.18.2
|
||||
|
||||
* Fri Feb 14 2020 Antonio Cardace <acardace@redhat.com> - 1.10.8-2
|
||||
- Fix race condition when cancelling a flash operation (rh #1758128)
|
||||
* Mon Sep 13 2021 Wen Liang <wenliang@redhat.com> - 1.18.0-1
|
||||
- Update to 1.18.0
|
||||
|
||||
* Fri Nov 29 2019 Lubomir Rintel <lrintel@redhat.com> - 1.10.8-1
|
||||
* Fri Aug 20 2021 Thomas Haller <thaller@redhat.com> - 1.14.10-6
|
||||
- depend ModemManager on polkit package (rh #1995186)
|
||||
|
||||
* Thu Aug 19 2021 Thomas Haller <thaller@redhat.com> - 1.14.10-5
|
||||
- enable polkit support to allow normal users to access modems (rh #1995186)
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.10-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.10-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Jan 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.10-1
|
||||
- Update to 1.14.10
|
||||
- Spec clean up
|
||||
|
||||
* Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-2
|
||||
- Drop unneeded libxslt dependency
|
||||
|
||||
* Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-1
|
||||
- Update to 1.14.8
|
||||
|
||||
* Tue Nov 3 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.6-1
|
||||
- Update to 1.14.6
|
||||
|
||||
* Thu Aug 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.2-1
|
||||
- Update to 1.14.2
|
||||
|
||||
* Mon Jul 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.0-1
|
||||
- Update to 1.14.0
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Mar 24 2020 Lubomir Rintel <lkundrak@v3.sk> - 1.12.8-1
|
||||
- Update to 1.12.8 release
|
||||
|
||||
* Thu Mar 5 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1.12.6-1
|
||||
- Update to 1.12.6 release
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Nov 29 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.8-1
|
||||
- Update to 1.10.8 release
|
||||
|
||||
* Wed Oct 16 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-1
|
||||
* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-2
|
||||
- Don't grab cdc_ether devices on Sierra QMI modems
|
||||
|
||||
* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-1
|
||||
- Update to 1.10.6 release
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Jul 10 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.4-1
|
||||
- Update to 1.10.2 release (rh #1543498)
|
||||
- Update to 1.10.4 release
|
||||
|
||||
* Fri Jun 14 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.2-1
|
||||
- Update to 1.10.2 release (rh #1543498)
|
||||
- Don't grab cdc_ether devices on Sierra QMI modems (rh #1712031)
|
||||
- Update to 1.10.2 release
|
||||
- Don't grab cdc_ether devices on Sierra QMI modems
|
||||
|
||||
* Mon May 06 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.0-1
|
||||
- Update to 1.10.0 release
|
||||
* Wed Mar 27 2019 Richard Hughes <richard@hughsie.com> 1.10.0-1
|
||||
- Update to the release tarball.
|
||||
|
||||
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 1.10.0-0.3.rc1
|
||||
- Update BRs for vala packaging changes
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-0.2.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.0-0.1.rc1
|
||||
- Update to 1.10 release candidate 1
|
||||
|
||||
* Tue Jan 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.2-1
|
||||
- Update to 1.8.2 release
|
||||
|
||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.8.0-4
|
||||
- Rebuild with fixed binutils
|
||||
|
||||
* Sun Jul 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.8.0-3
|
||||
- -devel: own %%_includedir/ModemManager/
|
||||
- %%build: --disable-silent-rules
|
||||
- use %%make_build %%make_install
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sun Jun 03 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.0-1
|
||||
- Update to 1.8.0 release
|
||||
|
|
|
|||
Loading…
Reference in New Issue