[mbm-gps*] Bumps.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@354 df209809-8e4a-0410-9a64-c169741eb0fc

2 files changed, 33 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b8e52ebba65..39e1ad6fe83d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mbm-gpsd-git
 	pkgdesc = GPS support files for Ericsson F3507g that provide an easy interface to gpsd
-	pkgver = 20121031
-	pkgrel = 3
+	pkgver = r46.cf61a6c
+	pkgrel = 1
 	url = http://mbm.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -13,8 +13,10 @@ pkgbase = mbm-gpsd-git
 	depends = gtk-doc
 	depends = libnl1
 	provides = mbm-gpsd
+	source = git://mbm.git.sourceforge.net/gitroot/mbm/mbm-gpsd/
 	source = mbm-gpsd.service
 	source = 0001-Remove-call-to-g_type_init.patch
+	md5sums = SKIP
 	md5sums = 1c4fd254cd00834f644ab614a76f5c96
 	md5sums = b95c87ed13611f3903ed9bc5e504b947
 
diff --git a/PKGBUILD b/PKGBUILD
index 950f34efa053..898ffe809bc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,48 @@
-# Contributor: Andreas Boehler <andy dot boehler at gmx dot at> 
+# Contributor: Andreas Boehler <andy dot boehler at gmx dot at>
 # Maintainer: Olivier Mehani <shtrom-aur@ssji.net>
+# Contributor: Frederik "Freso" S. Olesen <freso.dk@gmail.com>
 
-pkgname=mbm-gpsd-git
-pkgver=20121031
-pkgrel=3
+_gitname=mbm-gpsd
+pkgname="${_gitname}-git"
+pkgver=r46.cf61a6c
+pkgrel=1
 pkgdesc="GPS support files for Ericsson F3507g that provide an easy interface to gpsd"
 arch=('i686' 'x86_64')
 url="http://mbm.sourceforge.net/"
 license=('GPL')
-groups=()
 depends=('networkmanager' 'network-manager-applet' 'intltool' 'gtk-doc' 'libnl1')
 makedepends=('git')
-optdepends=()
-provides=('mbm-gpsd')
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
+provides=("${_gitname}")
 source=(
+"git://mbm.git.sourceforge.net/gitroot/mbm/${_gitname}/"
 mbm-gpsd.service
 0001-Remove-call-to-g_type_init.patch
 )
-noextract=()
-_gitname=mbm-gpsd
-_gitroot=git://mbm.git.sourceforge.net/gitroot/mbm/${_gitname}/
 
+pkgver() {
+	cd "${srcdir}/${_gitname}"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+	cd "${srcdir}/${_gitname}"
+	git am "${srcdir}/0001-Remove-call-to-g_type_init.patch"
+}
 
 build() {
-  msg "Connecting to sourceforge.net git server...."
-  rm  -rf ${startdir}/src/${_gitname}-build
-  if [[ -d ${_gitname} ]]; then
-  cd ${_gitname} || return 1
-  git pull origin || return 1
-  else
-  git clone ${_gitroot} $_gitname || return 1
-  fi
-  msg " checkout done."
-  cd ${srcdir} || return 1
-  cp -r ${_gitname} $_gitname-build
-  cd ${_gitname}-build || return 1
-  patch -p1 < ${srcdir}/0001-Remove-call-to-g_type_init.patch
-  unset CFLAGS
-  unset CXXFLAGS
-  ./autogen.sh  --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make CFLAGS="-Wno-error" || return 1
+	cd "${srcdir}/${_gitname}"
+	unset CFLAGS
+	unset CXXFLAGS
+	./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+	make CFLAGS="-Wno-error"
 }
 
 package() {
-  cd ${startdir}/src/${_gitname}-build
-  make DESTDIR=${pkgdir} install || return 1
-  mv ${pkgdir}/usr/sbin/* ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/systemd/system/
-  cp ${srcdir}/mbm-gpsd.service ${pkgdir}/usr/lib/systemd/system/
-  rmdir ${pkgdir}/usr/sbin/
-  rm -rf ${srcdir}/${_gitname}-build
+	cd "${srcdir}/${_gitname}"
+	make DESTDIR="${pkgdir}" install
+	mkdir -p "${pkgdir}/usr/lib/systemd/system/"
+	cp "${srcdir}/mbm-gpsd.service" "${pkgdir}/usr/lib/systemd/system/"
 }
-md5sums=('1c4fd254cd00834f644ab614a76f5c96'
-         'b95c87ed13611f3903ed9bc5e504b947')
+md5sums=('SKIP'
+'1c4fd254cd00834f644ab614a76f5c96'
+'b95c87ed13611f3903ed9bc5e504b947')