diff --git a/ModemManager.spec b/ModemManager.spec index 4cb160c..e64ac01 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -1,9 +1,10 @@ -%define snapshot .git20091218 +%define snapshot .git20100101 +%define ppp_version 2.4.4 Summary: Mobile broadband modem management service Name: ModemManager Version: 0.2.997 -Release: 4%{snapshot}%{?dist} +Release: 5%{snapshot}%{?dist} # # Source from git://anongit.freedesktop.org/ModemManager/ModemManager # tarball built with: @@ -19,6 +20,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: glib2-devel BuildRequires: dbus-glib-devel >= 0.75 BuildRequires: libgudev-devel >= 143 +BuildRequires: ppp >= %{ppp_version} +BuildRequires: ppp-devel >= %{ppp_version} %description The ModemManager service provides a consistent API to operate many different @@ -28,10 +31,13 @@ modems, including mobile broadband (3G) devices. %setup -q %build + +pppddir=`ls -1d %{_libdir}/pppd/2*` %configure \ --enable-more-warnings=yes \ --with-udev-base-dir=/lib/udev \ - --disable-static + --disable-static \ + --with-pppd-plugin-dir=$pppddir make %{?_smp_mflags} @@ -43,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT 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 %clean rm -rf $RPM_BUILD_ROOT @@ -62,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rules.d/* %changelog +* Fri Jan 1 2010 Dan Williams - 0.2.997-5.git20100101 +- core: fix apparent hangs by limiting retried serial writes +- gsm: ensure modem state is reset when disabled + * Fri Dec 18 2009 Dan Williams - 0.2.997-4.git20091218 - sierra: fix CDMA registration detection in some cases (rh #547513) diff --git a/sources b/sources index 84b6a26..46460a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5972d307305992cce8f12a27b2a62c1 ModemManager-0.2.997.git20091218.tar.bz2 +bd186d74e1b478932fe1c32a49d78da7 ModemManager-0.2.997.git20100101.tar.bz2