Attachment 924015 Details for Bug 1125426 – Update to 1.3.0 git 3dd6f93 2014-08-04

[patch] Update to 1.3.0 git 3dd6f93 2014-08-04

Update-to-1.3.0-git-3dd6f93-2014-08-04.patch (text/plain), 4.57 KB, created by poma on 2014-08-04 22:33:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-08-04 22:33:48 UTC

Size: 4.57 KB

patch

obsolete

>
>Update to 1.3.0 git 3dd6f93 2014-08-04
>
>---
> ModemManager.spec                                 | 36 +++++++++++++++--------
> QMI-IPv4-Revert-to-MM_BEARER_IP_METHOD_DHCP.patch | 23 +++++++++++++++
> sources                                           |  2 +-
> 3 files changed, 48 insertions(+), 13 deletions(-)
> create mode 100644 QMI-IPv4-Revert-to-MM_BEARER_IP_METHOD_DHCP.patch
>
>diff --git a/ModemManager.spec b/ModemManager.spec
>index 5a2719b..098b47c 100644
>--- a/ModemManager.spec
>+++ b/ModemManager.spec
>@@ -1,34 +1,44 @@
>-
>+%global git_sha_short 3dd6f93
>+%global snapshot .git20140804
> %global glib2_version 2.32
> %global systemd_dir %{_prefix}/lib/systemd/system
>-
> %global _hardened_build 1
> 
> Summary: Mobile broadband modem management service
> Name: ModemManager
>-Version: 1.2.0
>-Release: 3%{?dist}
>+Version: 1.3.0
>+Release: 1%{snapshot}%{?dist}
> #
>-# Source from http://freedesktop.org/software/ModemManager/
>+# Source from git://anongit.freedesktop.org/%{name}/%{name}
>+# or http://cgit.freedesktop.org/%{name}/%{name}/snapshot/%{name}-%{git_sha_short}.tar.gz
>+# Local snapshot:
>+# tar xf %{name}-%{git_sha_short}.tar.gz
>+# mv %{name}-%{git_sha_short} %{name}-%{version}
>+# %{name}-%{version}/autogen.sh
>+# tar cJf %{name}-%{version}%{snapshot}.tar.xz %{name}-%{version}
> #
>-Source: %{name}-%{version}.tar.xz
>+Source: %{name}-%{version}%{snapshot}.tar.xz
> License: GPLv2+
> Group: System Environment/Base
> 
>-URL: https://wiki.gnome.org/Projects/NetworkManager
>+URL: http://freedesktop.org/wiki/Software/%{name}
> BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> Requires: glib2 >= %{glib2_version}
>+Requires: libmbim-utils
>+Requires: libqmi-utils
> BuildRequires: glib2-devel >= %{glib2_version}
> BuildRequires: libgudev1-devel >= 143
> BuildRequires: automake autoconf intltool libtool
> BuildRequires: intltool
> BuildRequires: libxslt gtk-doc
> BuildRequires: libqmi-devel >= 1.6
>-BuildRequires: libmbim-devel >= 1.5
>+BuildRequires: libmbim-devel >= 1.10
> BuildRequires: gobject-introspection-devel >= 0.10.3
> BuildRequires: vala-tools vala-devel
>+BuildRequires: polkit-devel
> 
> Patch0: buildsys-hates-openpty.patch
>+Patch1: QMI-IPv4-Revert-to-MM_BEARER_IP_METHOD_DHCP.patch
> 
> %description
> The ModemManager service manages WWAN modems and provides a consistent API for
>@@ -78,11 +88,9 @@ Vala bindings for ModemManager
> %prep
> %setup -q
> %patch0 -p1 -b .pty
>+%patch1 -p1 -b .DHCP
> 
> %build
>-
>-autoreconf -i --force
>-intltoolize --force
> %configure \
> 	--enable-more-warnings=error \
> 	--with-udev-base-dir=%{_prefix}/lib/udev \
>@@ -91,7 +99,6 @@ intltoolize --force
> 	--with-mbim=yes \
> 	--with-newest-qmi-commands \
> 	--disable-static \
>-	--with-polkit=no \
> 	--with-dist-version=%{version}-%{release}
> 
> make %{?_smp_mflags}
>@@ -140,6 +147,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_datadir}/icons/hicolor/22x22/apps/*.png
> %{_mandir}/man8/*
> %{_datadir}/locale/*/LC_MESSAGES/ModemManager.mo
>+%{_datadir}/polkit-1/actions/*.policy
> 
> %files devel
> %{_includedir}/ModemManager/*.h
>@@ -164,6 +172,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_datadir}/vala/vapi/libmm-glib.*
> 
> %changelog
>+* Mon Aug  4 2014 poma <poma@gmail.com> - 1.3.0-2.git20140804
>+- Update to a git commit 3dd6f93
>+- mm-bearer-qmi: QMI IPv4 - revert to working MM_BEARER_IP_METHOD_DHCP
>+
> * Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 1.2.0-3
> - Rebuilt for gobject-introspection 1.41.4
> 
>diff --git a/QMI-IPv4-Revert-to-MM_BEARER_IP_METHOD_DHCP.patch b/QMI-IPv4-Revert-to-MM_BEARER_IP_METHOD_DHCP.patch
>new file mode 100644
>index 0000000..8bfe830
>--- /dev/null
>+++ b/QMI-IPv4-Revert-to-MM_BEARER_IP_METHOD_DHCP.patch
>@@ -0,0 +1,23 @@
>+
>+mm-bearer-qmi: QMI IPv4 - revert to working MM_BEARER_IP_METHOD_DHCP
>+
>+---
>+ src/mm-bearer-qmi.c | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c
>+index c25b9f7..730334c 100644
>+--- a/src/mm-bearer-qmi.c
>++++ b/src/mm-bearer-qmi.c
>+@@ -291,7 +291,7 @@ get_ipv4_config (QmiMessageWdsGetCurrentSettingsOutput *output, guint32 mtu)
>+     mm_dbg ("QMI IPv4 Settings:");
>+ 
>+     config = mm_bearer_ip_config_new ();
>+-    mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_STATIC);
>++    mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_DHCP);
>+ 
>+     /* IPv4 address */
>+     qmi_inet4_ntop (addr, buf, sizeof (buf));
>+-- 
>+2.0.4
>+
>diff --git a/sources b/sources
>index 1637324..b2e8857 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-6e70ab7c5f96aa6a4d5612c1d5ae5bb3  ModemManager-1.2.0.tar.xz
>+0a8106e4c8d1ec595310d20db5c78409  ModemManager-1.3.0.git20140804.tar.xz
>-- 
>2.0.4
>

Actions: View | Diff

Attachments on bug 1125426: 923028 | 923437 | 923787 | 924015 | 924016 | 929737