[arch-commits] Commit in (geoclue geoclue/trunk geoclue/trunk/PKGBUILD)

[Jan Steffens]

    Date: Wednesday, January 30, 2019 @ 09:20:00
  Author: heftig
Revision: 344940

Replace geoclue2 with geoclue

Added:
  geoclue/
  geoclue/trunk/
Modified:
  geoclue/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: geoclue/trunk/PKGBUILD
===================================================================
--- geoclue2/trunk/PKGBUILD	2019-01-30 07:54:54 UTC (rev 344939)
+++ geoclue/trunk/PKGBUILD	2019-01-30 09:20:00 UTC (rev 344940)
@@ -1,9 +1,9 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: György Balló <ballogy at freestart.hu>
 
-pkgname=geoclue2
+pkgname=geoclue
 pkgver=2.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/GeoClue/"
@@ -11,8 +11,10 @@
 depends=(libsoup json-glib libmm-glib avahi geocode-glib)
 makedepends=(systemd gobject-introspection git vala meson gtk-doc libnotify)
 optdepends=('libnotify: Demo Agent')
+provides=("geoclue2=$pkgver-$pkgrel")
+conflicts=(geoclue2)
+replaces=(geoclue2)
 backup=(etc/geoclue/geoclue.conf)
-conflicts=(geoclue)
 _commit=ed2d81fe558b657b52940dd52316bcc1a32d0cff  # tags/2.5.2^0
 source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
 sha256sums=('SKIP')
@@ -30,19 +32,16 @@
 _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
 
 pkgver() {
-  cd geoclue
+  cd $pkgname
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd geoclue
-  sed -e "s/key=geoclue/key=$_mozilla_api_key/" \
-      -e "s/key=YOUR_KEY/key=$_google_api_key/" \
-      -i data/geoclue.conf.in
+  cd $pkgname
 }
 
 build() {
-  arch-meson geoclue build -D dbus-sys-dir=/usr/share/dbus-1/system.d
+  arch-meson $pkgname build -D dbus-sys-dir=/usr/share/dbus-1/system.d
   ninja -C build
 }