updated and fixed for conventions's sake

2 files changed, 15 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea213ee98ebb..b1614691b501 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,16 @@
 pkgbase = sane-airscan-git
 	pkgdesc = SANE - Apple AirScan (eSCL) driver
-	pkgver = 0.9.12
+	pkgver = 0.9.15.r4.g04857b0
 	pkgrel = 1
 	url = https://github.com/alexpevzner/sane-airscan
 	arch = aarch64
 	arch = x86_64
-	license = GPLv2
+	license = GPL2
+	makedepends = ctags
 	makedepends = git
-	depends = libjpeg-turbo
 	depends = sane
-	depends = glib2
 	depends = libsoup
-	depends = libxml2
-	depends = avahi
-	depends = gcc
-	depends = make
-	depends = pkgconf
-	provides = sane-airscan
+	conflicts = sane-airscan
 	source = git://github.com/alexpevzner/sane-airscan.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 0e71aafd5672..1b1cdd18f04f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,31 @@
 # Maintainer: Thomas Kiss <thokis@gmail.com>
 
 pkgname=sane-airscan-git
-pkgver=0.9.12
+pkgver=0.9.15.r4.g04857b0
 pkgrel=1
 pkgdesc='SANE - Apple AirScan (eSCL) driver'
 url='https://github.com/alexpevzner/sane-airscan'
 arch=('aarch64' 'x86_64')
-license=('GPLv2')
-depends=('libjpeg-turbo' 'sane' 'glib2' 'libsoup' 'libxml2' 'avahi' 'gcc' 'make' 'pkgconf')
-makedepends=('git')
+license=('GPL2')
+depends=('sane' 'libsoup')
+makedepends=('ctags' 'git')
 source=('git://github.com/alexpevzner/sane-airscan.git')
 sha1sums=('SKIP')
-provides=("sane-airscan")
+conflicts=("sane-airscan")
 
 
 pkgver() {
-    cd "${srcdir}/sane-airscan"
-    git describe --long --tags | cut -f1 -d'-'
+    cd "sane-airscan"
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "${srcdir}/sane-airscan"
-
-    make -j $(nproc)
+    cd "sane-airscan"
+    make
 }
 
 package() {
-    cd "${srcdir}/sane-airscan"
-    
-    mkdir -p "${pkgdir}/etc/sane.d"
-    mkdir -p "${pkgdir}/etc/sane.d/dll.d"
-    cp -n airscan.conf "${pkgdir}/etc/sane.d"
-    cp -n dll.conf "${pkgdir}/etc/sane.d/dll.d/airscan"
-    install -Dm644 libsane-airscan.so.1 "${pkgdir}/usr/lib/sane/libsane-airscan.so.1"
-    mkdir -p "${pkgdir}/usr/share/man/man5"
-    tar -cpf "${pkgdir}/usr/share/man/man5/sane-airscan.5.gz" sane-airscan.5
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    cd "sane-airscan"
+    make DESTDIR="$pkgdir" install
     install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README"
 }