fixup package and re-submit

1 files changed, 13 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 871459614a8d..5efce5dad933 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,25 @@
 pkgname=douane-dkms-git
-pkgver=1
-pkgrel=2
+pkgver=0.8.2+5.gdf94296dea10b3a5ce3e
+pkgrel=1
 pkgdesc="Douane Firewall Kernel Module (DKMS)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://douaneapp.com/"
 license=('GPL2')
 depends=('dkms')
 makedepends=('git')
-install=${pkgname}.install
-source=('git+https://github.com/Douane/douane-dkms.git'
-        "${pkgname}.install")
-md5sums=('SKIP'
-         '3754DB1C07F0F21AB3A3A167138DD791')
+source=('git+https://gitlab.com/douaneapp/douane-dkms.git')
+md5sums=('SKIP')
+conflicts=(douane-dkms)
+provides=(douane-dkms=${pkgver%+*})
 
 pkgver() {
-  cd "$srcdir/douane-dkms"
-  # Use the tag of the last commit
-  git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+  git -C douane-dkms describe --always | sed 's/^v//; s/-/+/; s/-/./'
 }
 
-
 package() {
-  # Install
-  cd "$srcdir/douane-dkms"
-  # Copy dkms.conf
-  install -Dm644 dkms.conf "${pkgdir}"/usr/src/${pkgname}-${pkgver}/dkms.conf
-
-  # Set name and versionz
-  sed -e "s/@_PKGBASE@/${_pkgbase}/" \
-      -e "s/@PKGVER@/${pkgver}/" \
-      -i "${pkgdir}"/usr/src/${pkgname}-${pkgver}/dkms.conf
-
-  for i in "${srcdir}/douane-dkms/"{Makefile,douane.c,network_activity_message.h}; do
-    install -D -m644 "${i}" "${pkgdir}/usr/src/${pkgname}-${pkgver}/"
-  done
+  install -Dm644 -t "$pkgdir/usr/src/$pkgname-$pkgver/" \
+    douane-dkms/dkms.conf \
+    douane-dkms/Makefile \
+    douane-dkms/*.c \
+    douane-dkms/*.h
 }