[arch-commits] Commit in modemmanager/trunk (4 files)

[Jan Steffens]

    Date: Saturday, April 6, 2013 @ 20:39:10
  Author: heftig
Revision: 182089

0.7.990, for gnome-unstable

Added:
  modemmanager/trunk/ModemManager.service
    (from rev 182085, modemmanager/trunk/modem-manager.service)
  modemmanager/trunk/modemmanager.install
Modified:
  modemmanager/trunk/PKGBUILD
Deleted:
  modemmanager/trunk/modem-manager.service

-----------------------+
 ModemManager.service  |   14 ++++++++++++++
 PKGBUILD              |   37 ++++++++++++++++++++-----------------
 modem-manager.service |   14 --------------
 modemmanager.install  |   12 ++++++++++++
 4 files changed, 46 insertions(+), 31 deletions(-)

Copied: modemmanager/trunk/ModemManager.service (from rev 182085, modemmanager/trunk/modem-manager.service)
===================================================================
--- ModemManager.service	                        (rev 0)
+++ ModemManager.service	2013-04-06 18:39:10 UTC (rev 182089)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Modem Manager
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.ModemManager1
+ExecStart=/usr/sbin/ModemManager
+# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
+# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
+# results in logging each message twice.
+StandardError=null
+
+[Install]
+WantedBy=multi-user.target

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-06 18:32:26 UTC (rev 182088)
+++ PKGBUILD	2013-04-06 18:39:10 UTC (rev 182089)
@@ -1,29 +1,32 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
+
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.6.0.0
+pkgver=0.7.990
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-license=('GPL2')
-depends=('dbus-glib' 'udev' 'ppp')
-makedepends=('intltool')
+license=(GPL2)
+depends=(udev ppp libqmi polkit hicolor-icon-theme)
+makedepends=(intltool)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
-        modem-manager.service)
-sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
-            '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
+install=modemmanager.install
+source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz
+        ModemManager.service)
+sha256sums=('36547db99fccd7eac1f1dd75178232a61306c6b11e8926b83bcfc3a12c4222ca'
+            '4c622bea22582751c1a0715f69cf7f393ac9d1318e09b02c2ea8d251261983ee')
 
 build() {
   cd "$_realname-$pkgver"
    ./configure --prefix=/usr \
-   	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--with-udev-base-dir=/usr/lib/udev \
-	--disable-static
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-udev-base-dir=/usr/lib/udev \
+        --disable-static \
+        --with-polkit
   make
 }
 
@@ -31,8 +34,8 @@
   cd "$_realname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir/modem-manager.service" \
-    "$pkgdir/usr/lib/systemd/system/modem-manager.service"
-  echo "SystemdService=modem-manager.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service"
+  install -Dm644 "$srcdir/ModemManager.service" \
+    "$pkgdir/usr/lib/systemd/system/ModemManager.service"
+  echo "SystemdService=ModemManager.service" \
+    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service"
 }

Deleted: modem-manager.service
===================================================================
--- modem-manager.service	2013-04-06 18:32:26 UTC (rev 182088)
+++ modem-manager.service	2013-04-06 18:39:10 UTC (rev 182089)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Modem Manager
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
-# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
-# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
-# results in logging each message twice.
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target

Added: modemmanager.install
===================================================================
--- modemmanager.install	                        (rev 0)
+++ modemmanager.install	2013-04-06 18:39:10 UTC (rev 182089)
@@ -0,0 +1,12 @@
+post_install() {
+  type -P gtk-update-icon-cache &>/dev/null &&
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}