lkundrak pushed to ModemManager (f22). "Merge branch 'master' into f22"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Mar 29 19:24:33 UTC 2015
>From b8d878710cfe54c34db7203dc15131cb2862cda9 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Tue, 17 Feb 2015 13:07:43 -0600
Subject: Disable --with-newest-qmi-commands
It was only intended to be experimental and doesn't provide anything
that older commands cannot. Plus upstream has removed the option.
diff --git a/ModemManager.spec b/ModemManager.spec
index 4854fd0..ab58c07 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -95,7 +95,6 @@ intltoolize --force
--enable-gtk-doc \
--with-qmi=yes \
--with-mbim=yes \
- --with-newest-qmi-commands \
--disable-static \
--with-polkit=no \
--with-dist-version=%{version}-%{release}
--
cgit v0.10.2
>From 02ab402defdb7eb506537727867ef12924b3e8fb Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Mon, 2 Mar 2015 14:40:42 -0600
Subject: Don't print GSM cell location at default log level (rh #1194492)
diff --git a/ModemManager.spec b/ModemManager.spec
index ab58c07..5592bd5 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -7,7 +7,7 @@
Summary: Mobile broadband modem management service
Name: ModemManager
Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
#
# Source from http://freedesktop.org/software/ModemManager/
#
@@ -34,6 +34,7 @@ BuildRequires: vala-tools vala-devel
BuildRequires: dbus
Patch0: buildsys-hates-openpty.patch
+Patch1: 0001-iface-modem-location-don-t-print-location-info-to-sy.patch
%description
The ModemManager service manages WWAN modems and provides a consistent API for
@@ -83,6 +84,7 @@ Vala bindings for ModemManager
%prep
%setup -q
%patch0 -p1 -b .pty
+%patch1 -p1 -b .dont-print-location
%build
@@ -170,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/vala/vapi/libmm-glib.*
%changelog
+* Mon Mar 2 2015 Dan Williams <dcbw at redhat.com> - 1.4.4-2
+- Don't print location information in logs (rh #1194492)
+
* Wed Feb 11 2015 Lubomir Rintel <lkundrak at v3.sk> - 1.4.4-1
- Update to 1.4.4 release
--
cgit v0.10.2
>From 132f2d5af5b2554405056befc1a3d6bb554aedb7 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Mon, 2 Mar 2015 14:41:28 -0600
Subject: Add missing patch
diff --git a/0001-iface-modem-location-don-t-print-location-info-to-sy.patch b/0001-iface-modem-location-don-t-print-location-info-to-sy.patch
new file mode 100644
index 0000000..dd2c167
--- /dev/null
+++ b/0001-iface-modem-location-don-t-print-location-info-to-sy.patch
@@ -0,0 +1,70 @@
+From b17b52747b1b70d9ac6cfe0647b77f7d84efd771 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander at aleksander.es>
+Date: Fri, 26 Dec 2014 16:36:32 +0100
+Subject: [PATCH] iface-modem-location: don't print location info to syslog
+ with info level
+
+Use debug level, which has to be explicitly requested by the user.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=87498
+(cherry picked from commit 0dd707a2793c28369991377a0e09e00d3a09636f)
+---
+ src/mm-iface-modem-location.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/mm-iface-modem-location.c b/src/mm-iface-modem-location.c
+index 57d5f2c..f97789e 100644
+--- a/src/mm-iface-modem-location.c
++++ b/src/mm-iface-modem-location.c
+@@ -216,8 +216,8 @@ notify_gps_location_update (MMIfaceModemLocation *self,
+ const gchar *dbus_path;
+
+ dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
+- mm_info ("Modem %s: GPS location updated",
+- dbus_path);
++ mm_dbg ("Modem %s: GPS location updated",
++ dbus_path);
+
+ /* We only update the property if we are supposed to signal
+ * location */
+@@ -286,13 +286,13 @@ notify_3gpp_location_update (MMIfaceModemLocation *self,
+ const gchar *dbus_path;
+
+ dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
+- mm_info ("Modem %s: 3GPP location updated "
+- "(MCC: '%u', MNC: '%u', Location area code: '%lX', Cell ID: '%lX')",
+- dbus_path,
+- mm_location_3gpp_get_mobile_country_code (location_3gpp),
+- mm_location_3gpp_get_mobile_network_code (location_3gpp),
+- mm_location_3gpp_get_location_area_code (location_3gpp),
+- mm_location_3gpp_get_cell_id (location_3gpp));
++ mm_dbg ("Modem %s: 3GPP location updated "
++ "(MCC: '%u', MNC: '%u', Location area code: '%lX', Cell ID: '%lX')",
++ dbus_path,
++ mm_location_3gpp_get_mobile_country_code (location_3gpp),
++ mm_location_3gpp_get_mobile_network_code (location_3gpp),
++ mm_location_3gpp_get_location_area_code (location_3gpp),
++ mm_location_3gpp_get_cell_id (location_3gpp));
+
+ /* We only update the property if we are supposed to signal
+ * location */
+@@ -403,11 +403,11 @@ notify_cdma_bs_location_update (MMIfaceModemLocation *self,
+ const gchar *dbus_path;
+
+ dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
+- mm_info ("Modem %s: CDMA BS location updated "
+- "(Longitude: '%lf', Latitude: '%lf')",
+- dbus_path,
+- mm_location_cdma_bs_get_longitude (location_cdma_bs),
+- mm_location_cdma_bs_get_latitude (location_cdma_bs));
++ mm_dbg ("Modem %s: CDMA BS location updated "
++ "(Longitude: '%lf', Latitude: '%lf')",
++ dbus_path,
++ mm_location_cdma_bs_get_longitude (location_cdma_bs),
++ mm_location_cdma_bs_get_latitude (location_cdma_bs));
+
+ /* We only update the property if we are supposed to signal
+ * location */
+--
+2.1.0
+
--
cgit v0.10.2
>From 2c968d5d50a861f00db278ba41862813485a7211 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun, 29 Mar 2015 21:20:22 +0200
Subject: Update to 1.4.6 release
diff --git a/.gitignore b/.gitignore
index a18af2f..371aaee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ ModemManager-0.4.git20100720.tar.bz2
/ModemManager-1.4.0.tar.xz
/ModemManager-1.4.2.tar.xz
/ModemManager-1.4.4.tar.xz
+/ModemManager-1.4.6.tar.xz
diff --git a/0001-iface-modem-location-don-t-print-location-info-to-sy.patch b/0001-iface-modem-location-don-t-print-location-info-to-sy.patch
deleted file mode 100644
index dd2c167..0000000
--- a/0001-iface-modem-location-don-t-print-location-info-to-sy.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From b17b52747b1b70d9ac6cfe0647b77f7d84efd771 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander at aleksander.es>
-Date: Fri, 26 Dec 2014 16:36:32 +0100
-Subject: [PATCH] iface-modem-location: don't print location info to syslog
- with info level
-
-Use debug level, which has to be explicitly requested by the user.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=87498
-(cherry picked from commit 0dd707a2793c28369991377a0e09e00d3a09636f)
----
- src/mm-iface-modem-location.c | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/src/mm-iface-modem-location.c b/src/mm-iface-modem-location.c
-index 57d5f2c..f97789e 100644
---- a/src/mm-iface-modem-location.c
-+++ b/src/mm-iface-modem-location.c
-@@ -216,8 +216,8 @@ notify_gps_location_update (MMIfaceModemLocation *self,
- const gchar *dbus_path;
-
- dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
-- mm_info ("Modem %s: GPS location updated",
-- dbus_path);
-+ mm_dbg ("Modem %s: GPS location updated",
-+ dbus_path);
-
- /* We only update the property if we are supposed to signal
- * location */
-@@ -286,13 +286,13 @@ notify_3gpp_location_update (MMIfaceModemLocation *self,
- const gchar *dbus_path;
-
- dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
-- mm_info ("Modem %s: 3GPP location updated "
-- "(MCC: '%u', MNC: '%u', Location area code: '%lX', Cell ID: '%lX')",
-- dbus_path,
-- mm_location_3gpp_get_mobile_country_code (location_3gpp),
-- mm_location_3gpp_get_mobile_network_code (location_3gpp),
-- mm_location_3gpp_get_location_area_code (location_3gpp),
-- mm_location_3gpp_get_cell_id (location_3gpp));
-+ mm_dbg ("Modem %s: 3GPP location updated "
-+ "(MCC: '%u', MNC: '%u', Location area code: '%lX', Cell ID: '%lX')",
-+ dbus_path,
-+ mm_location_3gpp_get_mobile_country_code (location_3gpp),
-+ mm_location_3gpp_get_mobile_network_code (location_3gpp),
-+ mm_location_3gpp_get_location_area_code (location_3gpp),
-+ mm_location_3gpp_get_cell_id (location_3gpp));
-
- /* We only update the property if we are supposed to signal
- * location */
-@@ -403,11 +403,11 @@ notify_cdma_bs_location_update (MMIfaceModemLocation *self,
- const gchar *dbus_path;
-
- dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
-- mm_info ("Modem %s: CDMA BS location updated "
-- "(Longitude: '%lf', Latitude: '%lf')",
-- dbus_path,
-- mm_location_cdma_bs_get_longitude (location_cdma_bs),
-- mm_location_cdma_bs_get_latitude (location_cdma_bs));
-+ mm_dbg ("Modem %s: CDMA BS location updated "
-+ "(Longitude: '%lf', Latitude: '%lf')",
-+ dbus_path,
-+ mm_location_cdma_bs_get_longitude (location_cdma_bs),
-+ mm_location_cdma_bs_get_latitude (location_cdma_bs));
-
- /* We only update the property if we are supposed to signal
- * location */
---
-2.1.0
-
diff --git a/ModemManager.spec b/ModemManager.spec
index 5592bd5..e37168b 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -6,8 +6,8 @@
Summary: Mobile broadband modem management service
Name: ModemManager
-Version: 1.4.4
-Release: 2%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
#
# Source from http://freedesktop.org/software/ModemManager/
#
@@ -34,7 +34,6 @@ BuildRequires: vala-tools vala-devel
BuildRequires: dbus
Patch0: buildsys-hates-openpty.patch
-Patch1: 0001-iface-modem-location-don-t-print-location-info-to-sy.patch
%description
The ModemManager service manages WWAN modems and provides a consistent API for
@@ -84,7 +83,6 @@ Vala bindings for ModemManager
%prep
%setup -q
%patch0 -p1 -b .pty
-%patch1 -p1 -b .dont-print-location
%build
@@ -172,6 +170,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/vala/vapi/libmm-glib.*
%changelog
+* Sun Mar 29 2015 Lubomir Rintel <lkundrak at v3.sk> - 1.4.6-1
+- Update to 1.4.6 release
+
* Mon Mar 2 2015 Dan Williams <dcbw at redhat.com> - 1.4.4-2
- Don't print location information in logs (rh #1194492)
diff --git a/sources b/sources
index 9e2abc7..d09d08c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-248954c98df0002591506753b8011aa9 ModemManager-1.4.4.tar.xz
+158a5b5206d933121a993fd603a36b2a ModemManager-1.4.6.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ModemManager.git/commit/?h=f22&id=ebd375d16118fbab6819e577c98c23afdd921809
More information about the scm-commits
mailing list