git » modemmanager.git » commit 155acd4

Move to git master b95dc3f

author Jan Alexander Steffens
2013-04-17 18:37:23 UTC
committer Jan Alexander Steffens
2013-04-17 18:37:23 UTC
parent 9c481429a4299619c6a07ce3cfae99f77546269b

Move to git master b95dc3f

ModemManager.service +0 -14
PKGBUILD +9 -14

diff --git a/ModemManager.service b/ModemManager.service
deleted file mode 100644
index e5f68d6..0000000
--- a/ModemManager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[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
diff --git a/PKGBUILD b/PKGBUILD
index 1a9ee1e..1ed79bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,26 @@
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=modemmanager
 _realname=ModemManager
 pkgver=0.7.990
-pkgrel=1
+pkgrel=2
 pkgdesc="Mobile broadband modem management service"
 arch=(i686 x86_64)
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 license=(GPL2)
 depends=(udev ppp libqmi polkit hicolor-icon-theme)
-makedepends=(intltool)
+makedepends=(intltool git gtk-doc)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
 install=modemmanager.install
-source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz
-        ModemManager.service)
-sha256sums=('36547db99fccd7eac1f1dd75178232a61306c6b11e8926b83bcfc3a12c4222ca'
-            '4c622bea22582751c1a0715f69cf7f393ac9d1318e09b02c2ea8d251261983ee')
+#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz)
+source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=b95dc3f")
+sha256sums=('SKIP')
 
 build() {
-  cd "$_realname-$pkgver"
-   ./configure --prefix=/usr \
+  cd $_realname
+   ./autogen.sh --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --with-udev-base-dir=/usr/lib/udev \
@@ -30,11 +30,6 @@ build() {
 }
 
 package() {
-  cd "$_realname-$pkgver"
+  cd $_realname
   make DESTDIR="$pkgdir" install
-
-  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"
 }