git » modemmanager.git » commit 9c48142

0.7.990, for gnome-unstable

author Jan Alexander Steffens
2013-04-06 18:39:10 UTC
committer Jan Alexander Steffens
2013-04-06 18:39:10 UTC
parent 52c42c0563c3bb0e190d5aa6d4c27b86f7c2d0ec

0.7.990, for gnome-unstable

modem-manager.service => ModemManager.service +2 -2
PKGBUILD +20 -17
modemmanager.install +12 -0

diff --git a/modem-manager.service b/ModemManager.service
similarity index 81%
rename from modem-manager.service
rename to ModemManager.service
index bad666b..e5f68d6 100644
--- a/modem-manager.service
+++ b/ModemManager.service
@@ -3,8 +3,8 @@ Description=Modem Manager
 
 [Service]
 Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
+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.
diff --git a/PKGBUILD b/PKGBUILD
index ee3cfb0..1a9ee1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,31 @@
 # Maintainer: Ionut Biru <ibiru@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
 }
 
@@ -30,8 +33,8 @@ package() {
   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"
 }
diff --git a/modemmanager.install b/modemmanager.install
new file mode 100644
index 0000000..be187f2
--- /dev/null
+++ b/modemmanager.install
@@ -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
+}