update to 0.19, move closer to upstream defaults

5 files changed, 15 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a0a312176cf..8b4dbd6cdcf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = neard
 	pkgdesc = Intel's Near Field Communication manager
-	pkgver = 0.18
+	pkgver = 0.19
 	pkgrel = 1
 	url = https://github.com/linux-nfc/neard
 	arch = i686
@@ -14,14 +14,9 @@ pkgbase = neard
 	depends = dbus>=1.2
 	depends = libnl
 	depends = glib2>=2.28
+	depends = glibc
 	backup = etc/neard/main.conf
-	source = https://git.kernel.org/cgit/network/nfc/neard.git/snapshot/neard-0.18.tar.gz
-	source = bindir.patch
-	source = config.patch
-	source = neard.service
-	md5sums = 0cd0760c0a8e6ee3b750ac827a86bb06
-	md5sums = 5ab4e8d3ec2b8dd1d591483b072b07b4
-	md5sums = 1e3cfed20a3dbdb7ee9d0946e1c8dc81
-	md5sums = 3968d529bd6d1604f7e2ee3ce18fd3b6
+	source = neard-0.19.tar.gz::https://github.com/linux-nfc/neard/archive/refs/tags/v0.19.tar.gz
+	sha384sums = 892ad3b875db9b1b5de1b8ce8c64d1e2efecd35167066501ffbbe864187361073dddd892c0f992b61a1f7aa6acfb1a49
 
 pkgname = neard
diff --git a/PKGBUILD b/PKGBUILD
index bd1300c26e6f..2c33691cc876 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,17 @@
 # Contributor: Dmytro Bagrii <dimich.dmb@gmail.com>
 
 pkgname=neard
-pkgver=0.18
+pkgver=0.19
 pkgrel=1
 pkgdesc="Intel's Near Field Communication manager"
 arch=('i686' 'x86_64')
 url="https://github.com/linux-nfc/neard"
 license=('GPL2')
-depends=('dbus>=1.2' 'libnl' 'glib2>=2.28')
+depends=('dbus>=1.2' 'libnl' 'glib2>=2.28' 'glibc')
 makedepends=('automake' 'autoconf>=2.60' 'autoconf-archive' 'libtool' 'chrpath')
 backup=(etc/neard/main.conf)
-source=(https://git.kernel.org/cgit/network/nfc/neard.git/snapshot/$pkgname-$pkgver.tar.gz
-        bindir.patch
-        config.patch
-        neard.service)
-md5sums=('0cd0760c0a8e6ee3b750ac827a86bb06'
-         '5ab4e8d3ec2b8dd1d591483b072b07b4'
-         '1e3cfed20a3dbdb7ee9d0946e1c8dc81'
-         '3968d529bd6d1604f7e2ee3ce18fd3b6')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i $srcdir/bindir.patch
-  patch -p1 -i $srcdir/config.patch
-}
+source=($pkgname-$pkgver.tar.gz::https://github.com/linux-nfc/neard/archive/refs/tags/v$pkgver.tar.gz)
+sha384sums=('892ad3b875db9b1b5de1b8ce8c64d1e2efecd35167066501ffbbe864187361073dddd892c0f992b61a1f7aa6acfb1a49')
 
 build() {
   cd $pkgname-$pkgver
@@ -32,12 +20,15 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --libexecdir=/usr/lib/$pkgname \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-systemduserunitdir=/usr/lib/systemd/user \
+    --enable-systemd \
     --disable-debug \
+    --enable-ese \
     --enable-tools
 
-  make ${MAKEFLAGS}
+  make
 }
 
 package() {
@@ -51,13 +42,9 @@ package() {
   rm -f "${pkgdir}/usr/include/version.h"
 
   # libtool automatically adds a "$builddir/usr/lib"
-  chrpath -d "${pkgdir}/usr/bin/nciattach"
-  chrpath -d "${pkgdir}/usr/bin/neard"
-  chrpath -d "${pkgdir}/usr/bin/nfctool"
-
-  install -D -m644 "${srcdir}/neard.service" \
-    "${pkgdir}/usr/lib/systemd/system/neard.service"
-
+  #chrpath -d "${pkgdir}/usr/bin/nciattach"
+  #chrpath -d "${pkgdir}/usr/bin/neard"
+  #chrpath -d "${pkgdir}/usr/bin/nfctool"
   install -D -m644 "${srcdir}/$pkgname-$pkgver/src/main.conf" \
     "${pkgdir}/etc/neard/main.conf"
 }
diff --git a/bindir.patch b/bindir.patch
deleted file mode 100644
index 4bf173e8eaa8..000000000000
--- a/bindir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -aur neard-0.15.orig/Makefile.am neard-0.15.new/Makefile.am
---- neard-0.15.orig/Makefile.am	2014-12-08 00:20:48.000000000 +0100
-+++ neard-0.15.new/Makefile.am	2015-04-13 17:01:51.164776838 +0200
-@@ -31,10 +31,10 @@
- builtin_cflags =
- builtin_libadd =
- 
--bin_PROGRAMS =
-+bin_PROGRAMS = src/neard
- 
- pkglibexecdir = ${libexecdir}/nfc
--pkglibexec_PROGRAMS = src/neard
-+pkglibexec_PROGRAMS =
- 
- src_neard_SOURCES = $(gdbus_sources) $(gweb_sources) $(builtin_sources) \
- 			src/main.c src/error.c src/near.h src/log.c \
diff --git a/config.patch b/config.patch
deleted file mode 100644
index 8141bdc5707b..000000000000
--- a/config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur neard-0.15.orig/src/main.conf neard-0.15.new/src/main.conf
---- neard-0.15.orig/src/main.conf	2014-12-08 00:20:48.000000000 +0100
-+++ neard-0.15.new/src/main.conf	2015-04-13 17:06:33.953061915 +0200
-@@ -4,7 +4,7 @@
- # Constant polling will automatically trigger a new
- # polling loop whenever a tag or a device is no longer
- # in the RF field.
--ConstantPoll = true
-+ConstantPoll = false
- 
- # Automatically turn an adapter on when being discovered.
- # Default value is false.
diff --git a/neard.service b/neard.service
deleted file mode 100644
index 6cc65bd43ac4..000000000000
--- a/neard.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Near Field Communication Daemon
-Documentation=man:neard(8)
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/neard
-
-[Install]
-WantedBy=multi-user.target