upgpkg: libnet-git 1.2.r84.g3796862-1

2 files changed, 13 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c38d24300a85..3c5f5796c42d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libnet-git
 	pkgdesc = A portable framework for low-level network packet construction
-	pkgver = 1.2.rc3.r7.gbda4288
-	pkgrel = 2
+	pkgver = 1.2.r84.g3796862
+	pkgrel = 1
 	url = https://sourceforge.net/projects/libnet-dev/
 	arch = i686
 	arch = x86_64
@@ -15,4 +15,3 @@ pkgbase = libnet-git
 	sha256sums = SKIP
 
 pkgname = libnet-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 272847d55f16..37ec4cd54165 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=libnet-git
-pkgver=1.2.rc3.r7.gbda4288
-pkgrel=2
+pkgver=1.2.r84.g3796862
+pkgrel=1
 pkgdesc="A portable framework for low-level network packet construction"
 arch=('i686' 'x86_64')
 url="https://sourceforge.net/projects/libnet-dev/"
@@ -16,29 +16,27 @@ source=("git+https://github.com/sam-github/libnet.git")
 sha256sums=('SKIP')
 
 
-prepare() {
-  cd "libnet/libnet"
-
-  sed -i 's/doc //' "Makefile.am"
-}
-
 pkgver() {
   cd "libnet"
 
-  git describe --long --tags | sed 's/^libnet-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
 }
 
 build() {
-  cd "libnet/libnet"
+  cd "libnet"
 
   ./autogen.sh
-  ./configure --prefix="/usr"
+  ./configure \
+    --prefix="/usr"
   make
 }
 
 package() {
-  cd "libnet/libnet"
+  cd "libnet"
 
   make DESTDIR="$pkgdir" install
-  install -Dm644 "doc/COPYING" "$pkgdir/usr/share/licenses/libnet/COPYING"
+  install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/libnet"
 }