From 756aa4faea31e1b333695692fcf2590b1fda7087 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: May 02 2016 17:35:16 +0000 Subject: Update to 1.6 release candidate 3 --- diff --git a/.gitignore b/.gitignore index ed38ed3..b0372db 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ ModemManager-0.4.git20100720.tar.bz2 /ModemManager-1.4.14.tar.xz /ModemManager-1.5.990.tar.xz /ModemManager-1.5.991.tar.xz +/ModemManager-1.5.992.tar.xz diff --git a/ModemManager-bigendian.patch b/ModemManager-bigendian.patch deleted file mode 100644 index 1aad551..0000000 --- a/ModemManager-bigendian.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up ModemManager-1.5.991/plugins/huawei/mm-modem-helpers-huawei.c.than ModemManager-1.5.991/plugins/huawei/mm-modem-helpers-huawei.c ---- ModemManager-1.5.991/plugins/huawei/mm-modem-helpers-huawei.c.than 2016-04-12 14:03:15.519328232 +0200 -+++ ModemManager-1.5.991/plugins/huawei/mm-modem-helpers-huawei.c 2016-04-12 13:56:58.978491128 +0200 -@@ -190,7 +190,11 @@ match_info_to_ip4_addr (GMatchInfo *matc - if (!bin || bin_len != 4) - goto done; - -- *out_addr = GUINT32_TO_BE (*((guint32 *) bin)); -+#if __BYTE_ORDER == __BIG_ENDIAN -+ *out_addr = GUINT32_TO_LE (*((guint32 *) bin)); -+#else -+ *out_addr = GUINT32_TO_BE (*((guint32 *) bin)); -+#endif - success = TRUE; - - done: diff --git a/ModemManager.spec b/ModemManager.spec index a5025a9..848fe40 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -7,11 +7,11 @@ Summary: Mobile broadband modem management service Name: ModemManager Version: 1.6 -Release: 0.3.rc2%{?dist} +Release: 0.1.rc3%{?dist} # # Source from http://freedesktop.org/software/ModemManager/ # -Source: https://www.freedesktop.org/software/ModemManager/%{name}-1.5.991.tar.xz +Source: https://www.freedesktop.org/software/ModemManager/%{name}-1.5.992.tar.xz License: GPLv2+ Group: System Environment/Base @@ -36,8 +36,6 @@ BuildRequires: gobject-introspection-devel >= 1.38 BuildRequires: vala-tools vala-devel BuildRequires: dbus -Patch0: ModemManager-bigendian.patch - %description The ModemManager service manages WWAN modems and provides a consistent API for interacting with these devices to client applications. @@ -84,8 +82,7 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release} Vala bindings for ModemManager %prep -%setup -q -n %{name}-1.5.991 -%patch0 -p1 -b .endian +%setup -q -n %{name}-1.5.992 %build intltoolize --force @@ -173,6 +170,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/vala/vapi/libmm-glib.* %changelog +* Mon May 02 2016 Francesco Giudici - 1.6-0.1.rc3 +- Update to 1.6 release candidate 3 + * Tue Apr 12 2016 Than Ngo - 1.6-0.3.rc2 - add better fix for big endian issue on s390x/ppc64 diff --git a/sources b/sources index 120c237..3381073 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de876db43ae313ba8572783f63ba0fd1 ModemManager-1.5.991.tar.xz +64d82dbd8e62f701d9aaa57e24e0ed6a ModemManager-1.5.992.tar.xz