From 4f3603a278669756032b1bb57de73789fd3d308b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 10 Jul 2013 20:27:22 -0500 Subject: [PATCH] New snapshot, specfile cleanups and fixes for latest snapshot --- .gitignore | 1 + ModemManager.spec | 29 +++++++++++++++-------------- buildsys-hates-openpty.patch | 14 +++++++------- sources | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index d8f9263..0232597 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ ModemManager-0.4.git20100720.tar.bz2 /ModemManager-0.5.999.tar.bz2 /ModemManager-0.7.990.git20130515.tar.bz2 /ModemManager-0.7.991.git20130607.tar.bz2 +/ModemManager-0.7.991.git20130710.tar.xz diff --git a/ModemManager.spec b/ModemManager.spec index bfb284e..aca01ce 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -1,5 +1,4 @@ -%global snapshot .git20130607 -%global ppp_version 2.4.5 +%global snapshot .git20130710 %global glib2_version 2.32 %global systemd_dir %{_prefix}/lib/systemd/system @@ -8,14 +7,14 @@ Summary: Mobile broadband modem management service Name: ModemManager Version: 0.7.991 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} # # Source from git://anongit.freedesktop.org/ModemManager/ModemManager # tarball built with: # ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var # make distcheck # -Source: %{name}-%{version}%{snapshot}.tar.bz2 +Source: %{name}-%{version}%{snapshot}.tar.xz License: GPLv2+ Group: System Environment/Base @@ -25,8 +24,6 @@ Requires: glib2 >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libgudev1-devel >= 143 BuildRequires: libqmi-devel >= 1.3 -BuildRequires: ppp = %{ppp_version} -BuildRequires: ppp-devel = %{ppp_version} BuildRequires: automake autoconf intltool libtool BuildRequires: intltool BuildRequires: dia libxslt gtk-doc @@ -79,12 +76,10 @@ autoreconf -i --force intltoolize --force %configure \ --enable-more-warnings=error \ - --with-udev-base-dir=/lib/udev \ - --with-tests=yes \ + --with-udev-base-dir=%{_libdir}/udev \ --enable-gtk-doc=yes \ - --with-libqmi=yes \ + --with-qmi=yes \ --disable-static \ - --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --with-polkit=no \ --with-dist-version=%{version}-%{release} @@ -98,8 +93,6 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.so %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -130,7 +123,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(0755,root,root) %{_bindir}/mmcli %dir %{_libdir}/%{name} %attr(0755,root,root) %{_libdir}/%{name}/*.so* -/lib/udev/rules.d/* +%{_libdir}/udev/rules.d/* %{_datadir}/dbus-1/interfaces/*.xml %{systemd_dir}/ModemManager.service %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -154,6 +147,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/gtk-doc/html/libmm-glib/* %changelog +* Wed Jul 10 2013 Dan Williams - 0.7.991-2.git20130710 +- Handle PNP connected devices +- Fall back to AT for messaging if QMI modem doesn't support the WMS service +- Fix IPv6 bearer creation for HSO devices +- Fix detection of supported modes on Icera-based modems +- Fix handling of some Icera-based modems with limited capability ports +- Add support for Olivetti Olicard 200 + * Fri Jun 7 2013 Dan Williams - 0.7.991-1.git20130607 - Update to 0.7.991 snapshot - Fix SMS validity parsing @@ -227,7 +228,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Thu Jan 12 2012 Fedora Release Engineering - 0.4.998-2.git20110706 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Wed Jul 7 2011 Dan Williams - 0.4.998-1.git20110706 +* Thu Jul 7 2011 Dan Williams - 0.4.998-1.git20110706 - Update to 0.5-beta4 - gsm: various USSD fixes - samsung: support for Y3400 module and various other fixes diff --git a/buildsys-hates-openpty.patch b/buildsys-hates-openpty.patch index 3265cef..aa61d24 100644 --- a/buildsys-hates-openpty.patch +++ b/buildsys-hates-openpty.patch @@ -2,11 +2,11 @@ diff -up ModemManager-0.4.998/src/tests/Makefile.am.foo ModemManager-0.4.998/src --- ModemManager-0.4.998/src/tests/Makefile.am.foo 2011-07-06 17:59:53.711343366 -0500 +++ ModemManager-0.4.998/src/tests/Makefile.am 2011-07-06 18:00:08.971152593 -0500 @@ -45,7 +45,6 @@ if WITH_TESTS - check-local: $(noinst_PROGRAMS) - $(abs_builddir)/test-modem-helpers - $(abs_builddir)/test-charsets -- $(abs_builddir)/test-qcdm-serial-port - $(abs_builddir)/test-sms-part - if WITH_QMI - $(abs_builddir)/test-modem-helpers-qmi + noinst_PROGRAMS = \ + test-modem-helpers \ + test-charsets \ +- test-qcdm-serial-port \ + test-at-serial-port \ + test-sms-part + diff --git a/sources b/sources index c02a254..db073d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49355099ec9dadae79c2998026e32ead ModemManager-0.7.991.git20130607.tar.bz2 +91e740e91e2c3928d00dd4ede2c54b07 ModemManager-0.7.991.git20130710.tar.xz