Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Dan Williams | 2a1e75d8c8 | |
Dan Williams | 381ccfd50d | |
Peter Robinson | 675d2923c3 | |
Dan Williams | 298d86319c |
|
@ -28,3 +28,5 @@ ModemManager-0.4.git20100720.tar.bz2
|
||||||
/ModemManager-0.7.991.git20130710.tar.xz
|
/ModemManager-0.7.991.git20130710.tar.xz
|
||||||
/ModemManager-1.0.1.git20130723.tar.xz
|
/ModemManager-1.0.1.git20130723.tar.xz
|
||||||
/ModemManager-1.2.0.tar.xz
|
/ModemManager-1.2.0.tar.xz
|
||||||
|
/ModemManager-1.3.0.git20140805.3dd6f931.tar.xz
|
||||||
|
/ModemManager-1.4.0.tar.xz
|
||||||
|
|
|
@ -0,0 +1,70 @@
|
||||||
|
From b17b52747b1b70d9ac6cfe0647b77f7d84efd771 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Aleksander Morgado <aleksander@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
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
Summary: Mobile broadband modem management service
|
Summary: Mobile broadband modem management service
|
||||||
Name: ModemManager
|
Name: ModemManager
|
||||||
Version: 1.2.0
|
Version: 1.4.4
|
||||||
Release: 3%{?dist}
|
Release: 2%{?dist}
|
||||||
#
|
#
|
||||||
# Source from http://freedesktop.org/software/ModemManager/
|
# Source from http://freedesktop.org/software/ModemManager/
|
||||||
#
|
#
|
||||||
|
@ -18,17 +18,23 @@ Group: System Environment/Base
|
||||||
URL: https://wiki.gnome.org/Projects/NetworkManager
|
URL: https://wiki.gnome.org/Projects/NetworkManager
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
Requires: glib2 >= %{glib2_version}
|
Requires: glib2 >= %{glib2_version}
|
||||||
|
# For mbim-proxy and qmi-proxy
|
||||||
|
Requires: libmbim-utils
|
||||||
|
Requires: libqmi-utils
|
||||||
|
|
||||||
BuildRequires: glib2-devel >= %{glib2_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
BuildRequires: libgudev1-devel >= 143
|
BuildRequires: libgudev1-devel >= 143
|
||||||
BuildRequires: automake autoconf intltool libtool
|
BuildRequires: automake autoconf intltool libtool
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libxslt gtk-doc
|
BuildRequires: libxslt gtk-doc
|
||||||
BuildRequires: libqmi-devel >= 1.6
|
BuildRequires: libqmi-devel >= 1.12.4
|
||||||
BuildRequires: libmbim-devel >= 1.5
|
BuildRequires: libmbim-devel >= 1.10
|
||||||
BuildRequires: gobject-introspection-devel >= 0.10.3
|
BuildRequires: gobject-introspection-devel >= 1.38
|
||||||
BuildRequires: vala-tools vala-devel
|
BuildRequires: vala-tools vala-devel
|
||||||
|
BuildRequires: dbus
|
||||||
|
|
||||||
Patch0: buildsys-hates-openpty.patch
|
Patch0: buildsys-hates-openpty.patch
|
||||||
|
Patch1: 0001-iface-modem-location-don-t-print-location-info-to-sy.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The ModemManager service manages WWAN modems and provides a consistent API for
|
The ModemManager service manages WWAN modems and provides a consistent API for
|
||||||
|
@ -78,9 +84,11 @@ Vala bindings for ModemManager
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .pty
|
%patch0 -p1 -b .pty
|
||||||
|
%patch1 -p1 -b .dont-print-location
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
intltoolize --force
|
||||||
autoreconf -i --force
|
autoreconf -i --force
|
||||||
intltoolize --force
|
intltoolize --force
|
||||||
%configure \
|
%configure \
|
||||||
|
@ -89,7 +97,6 @@ intltoolize --force
|
||||||
--enable-gtk-doc \
|
--enable-gtk-doc \
|
||||||
--with-qmi=yes \
|
--with-qmi=yes \
|
||||||
--with-mbim=yes \
|
--with-mbim=yes \
|
||||||
--with-newest-qmi-commands \
|
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-polkit=no \
|
--with-polkit=no \
|
||||||
--with-dist-version=%{version}-%{release}
|
--with-dist-version=%{version}-%{release}
|
||||||
|
@ -105,6 +112,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
|
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
|
||||||
|
|
||||||
|
%find_lang %{name}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
%systemd_post ModemManager.service
|
%systemd_post ModemManager.service
|
||||||
|
@ -126,7 +135,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
%post glib -p /sbin/ldconfig
|
%post glib -p /sbin/ldconfig
|
||||||
%postun glib -p /sbin/ldconfig
|
%postun glib -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files -f %{name}.lang
|
||||||
%doc COPYING README
|
%doc COPYING README
|
||||||
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf
|
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf
|
||||||
%{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service
|
%{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service
|
||||||
|
@ -139,7 +148,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
%{systemd_dir}/ModemManager.service
|
%{systemd_dir}/ModemManager.service
|
||||||
%{_datadir}/icons/hicolor/22x22/apps/*.png
|
%{_datadir}/icons/hicolor/22x22/apps/*.png
|
||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
%{_datadir}/locale/*/LC_MESSAGES/ModemManager.mo
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/ModemManager/*.h
|
%{_includedir}/ModemManager/*.h
|
||||||
|
@ -164,6 +172,33 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
%{_datadir}/vala/vapi/libmm-glib.*
|
%{_datadir}/vala/vapi/libmm-glib.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 2 2015 Dan Williams <dcbw@redhat.com> - 1.4.4-2
|
||||||
|
- Don't print location information in logs (rh #1194492)
|
||||||
|
|
||||||
|
* Wed Feb 11 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.4.4-1
|
||||||
|
- Update to 1.4.4 release
|
||||||
|
|
||||||
|
* Thu Jan 15 2015 Dan Williams <dcbw@redhat.com> - 1.4.2-1
|
||||||
|
- Update to 1.4.2 release
|
||||||
|
|
||||||
|
* Wed Aug 27 2014 Dan Williams <dcbw@redhat.com> - 1.4.0-1
|
||||||
|
- Update to 1.4.0 release
|
||||||
|
- Quiet debug messages about access technology changes
|
||||||
|
- Improve network time support for Huawei 3GPP devices
|
||||||
|
- Always use DHCP for QMI bearers (fixes some Huawei devices)
|
||||||
|
|
||||||
|
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Aug 5 2014 Dan Williams <dcbw@redhat.com> - 1.3.0-1
|
||||||
|
- Update to git development snapshot
|
||||||
|
- Add IPv6 support for many devices
|
||||||
|
- Updated blacklist for non-modem USB devices
|
||||||
|
- Support for more MBIM devices from various manufacturers
|
||||||
|
- Support for more Huawei devices with network ports
|
||||||
|
- Add new "unmanaged" GPS location mode
|
||||||
|
- Many bug fixes for various modems
|
||||||
|
|
||||||
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 1.2.0-3
|
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 1.2.0-3
|
||||||
- Rebuilt for gobject-introspection 1.41.4
|
- Rebuilt for gobject-introspection 1.41.4
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue