- merged from DEVEL

Changed files:
    ModemManager.spec -> 1.4

diff --git a/ModemManager.spec b/ModemManager.spec
index 4dd0f7aa7fef0ccf202339fad84fc94ca650afa6..e025151564a7e0555514918cfc53d488864cafb0 100644 (file)
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -3,17 +3,19 @@
 #
 Summary:       Mobile broadband modem management service
 Name:          ModemManager
-Version:       0.3
-Release:       3
+Version:       0.4
+Release:       1
 License:       GPL v2
 Group:         Networking
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.3/%{name}-%{version}.tar.bz2
-# Source0-md5: c617210a9e388841b8aa782cdd9b48a0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.4/%{name}-%{version}.tar.bz2
+# Source0-md5: d4681f08e76cbb766522256144267ced
 URL:           http://www.gnome.org/projects/NetworkManager/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9
-BuildRequires: dbus-glib-devel >= 0.75
+BuildRequires: dbus-glib-devel >= 0.86
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ppp-plugin-devel >= 3:%{ppp_version}
@@ -29,7 +31,7 @@ different modems, including mobile broadband (3G) devices.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -54,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_sbindir}/modem-manager
 %dir %{_libdir}/ModemManager
+%attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-anydata.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-generic.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-gobi.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-hso.so
@@ -65,10 +68,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-novatel.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-option.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-sierra.so
+%attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-simtech.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-zte.so
 %attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/mm-test-pppd-plugin.so
 /lib/udev/rules.d/77-mm-ericsson-mbm.rules
 /lib/udev/rules.d/77-mm-longcheer-port-types.rules
+/lib/udev/rules.d/77-mm-pcmcia-device-blacklist.rules
+/lib/udev/rules.d/77-mm-platform-serial-whitelist.rules
+/lib/udev/rules.d/77-mm-simtech-port-types.rules
+/lib/udev/rules.d/77-mm-usb-device-blacklist.rules
 /lib/udev/rules.d/77-mm-zte-port-types.rules
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.ModemManager.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager.service
+%{_datadir}/polkit-1/actions/org.freedesktop.modem-manager.policy
+%{_iconsdir}/hicolor/*/apps/*.png