diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 44 | ||||
| -rw-r--r-- | bindir.patch | 16 | ||||
| -rw-r--r-- | config.patch | 12 | ||||
| -rw-r--r-- | neard.service | 10 |
6 files changed, 25 insertions, 79 deletions
@@ -1,26 +1,21 @@ pkgbase = neard pkgdesc = Intel's Near Field Communication manager - pkgver = 0.16 - pkgrel = 2 - url = https://01.org/linux-nfc/ + pkgver = 0.19 + pkgrel = 1 + url = https://github.com/linux-nfc/neard arch = i686 arch = x86_64 license = GPL2 makedepends = automake makedepends = autoconf>=2.60 + makedepends = autoconf-archive makedepends = libtool 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.16.tar.gz - source = bindir.patch - source = config.patch - source = neard.service - md5sums = c3d07aaefb394896656c1fdfb7ffa2b5 - 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/.gitignore b/.gitignore new file mode 100644 index 000000000000..62399afa57c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.tar.* +src/ +pkg/ @@ -1,30 +1,19 @@ -# Maintainer: Rupus Reinefjord <rupus@kltrst.se> +# Maintainer: Cody Schafer <archlinux@codyps.com> +# Contributor: Rupus Reinefjord <rupus@kltrst.se> # Contributor: Dmytro Bagrii <dimich.dmb@gmail.com> pkgname=neard -pkgver=0.16 -pkgrel=2 +pkgver=0.19 +pkgrel=1 pkgdesc="Intel's Near Field Communication manager" arch=('i686' 'x86_64') -url="https://01.org/linux-nfc/" +url="https://github.com/linux-nfc/neard" license=('GPL2') -depends=('dbus>=1.2' 'libnl' 'glib2>=2.28') -makedepends=('automake' 'autoconf>=2.60' 'libtool') +depends=('dbus>=1.2' 'libnl' 'glib2>=2.28' 'glibc') +makedepends=('automake' 'autoconf>=2.60' 'autoconf-archive' 'libtool') 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=('c3d07aaefb394896656c1fdfb7ffa2b5' - '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,10 +21,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() { @@ -48,14 +42,6 @@ package() { # include, so remove it 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" - 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 |