[ModemManager/f21] Update to latest stable version (1.4.4) and fix location log issue (rh #1194492)
Daniel Williams
dcbw at fedoraproject.org
Mon Mar 2 20:55:43 UTC 2015
commit 2a1e75d8c86d333bd3d70e30b94a5635df2dab85
Author: Dan Williams <dcbw at redhat.com>
Date: Mon Mar 2 14:44:49 2015 -0600
Update to latest stable version (1.4.4) and fix location log issue (rh #1194492)
...-location-don-t-print-location-info-to-sy.patch | 70 ++++++++++++++++++++++
ModemManager.spec | 25 ++++++--
sources | 2 +-
3 files changed, 90 insertions(+), 7 deletions(-)
---
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
+
diff --git a/ModemManager.spec b/ModemManager.spec
index c4ba52c..5592bd5 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -6,8 +6,8 @@
Summary: Mobile broadband modem management service
Name: ModemManager
-Version: 1.4.0
-Release: 1%{?dist}
+Version: 1.4.4
+Release: 2%{?dist}
#
# Source from http://freedesktop.org/software/ModemManager/
#
@@ -27,12 +27,14 @@ BuildRequires: libgudev1-devel >= 143
BuildRequires: automake autoconf intltool libtool
BuildRequires: intltool
BuildRequires: libxslt gtk-doc
-BuildRequires: libqmi-devel >= 1.10
+BuildRequires: libqmi-devel >= 1.12.4
BuildRequires: libmbim-devel >= 1.10
BuildRequires: gobject-introspection-devel >= 1.38
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
@@ -82,9 +84,11 @@ Vala bindings for ModemManager
%prep
%setup -q
%patch0 -p1 -b .pty
+%patch1 -p1 -b .dont-print-location
%build
+intltoolize --force
autoreconf -i --force
intltoolize --force
%configure \
@@ -93,7 +97,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}
@@ -109,6 +112,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+%find_lang %{name}
+
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%systemd_post ModemManager.service
@@ -130,7 +135,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%post glib -p /sbin/ldconfig
%postun glib -p /sbin/ldconfig
-%files
+%files -f %{name}.lang
%doc COPYING README
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service
@@ -143,7 +148,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{systemd_dir}/ModemManager.service
%{_datadir}/icons/hicolor/22x22/apps/*.png
%{_mandir}/man8/*
-%{_datadir}/locale/*/LC_MESSAGES/ModemManager.mo
%files devel
%{_includedir}/ModemManager/*.h
@@ -168,6 +172,15 @@ 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
+
+* Thu Jan 15 2015 Dan Williams <dcbw at redhat.com> - 1.4.2-1
+- Update to 1.4.2 release
+
* Wed Aug 27 2014 Dan Williams <dcbw at redhat.com> - 1.4.0-1
- Update to 1.4.0 release
- Quiet debug messages about access technology changes
diff --git a/sources b/sources
index a4138d5..9e2abc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f78b31c23828dc1037352d6dbb608db ModemManager-1.4.0.tar.xz
+248954c98df0002591506753b8011aa9 ModemManager-1.4.4.tar.xz
More information about the scm-commits
mailing list