updating to proper build process

3 files changed, 22 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c9878ee1c2d..7e041b031d91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by aurpkgs
-# Thu May 04 17:54:51 UTC 2017
+# Generated by mksrcinfo v8
+# Thu May  4 18:08:23 UTC 2017
 pkgbase = aif
 	pkgdesc = An XML and python-driven rebirth of the AIF (Arch Installation Framework) project.
 	pkgver = 0.01
-	pkgrel = 1
+	pkgrel = 2
 	url = https://aif.square-r00t.net/
 	arch = i686
 	arch = x86_64
@@ -12,10 +12,12 @@ pkgbase = aif
 	depends = arch-install-scripts
 	depends = parted
 	depends = gptfdisk
-	optdepends = python-lxml
-	source = https://git.square-r00t.net/AIF-NG/snapshot/AIF-NG-0.01-BETA.tar.xz
-	source = AIF-NG-0.01-BETA.tar.xz.sig
+	optdepends = python-lxml: better XML handling
+	conflicts = aif-git
+	source = aif-0.01.tar.xz::https://git.square-r00t.net/AIF-NG/snapshot/AIF-NG-0.01-BETA.tar.xz
+	source = aif-0.01.tar.xz.sig
 	sha512sums = ed98f77116f80a06405a0be9efeecb2d0f78ff702577d0f7f8f407210c50316106a602cef28f3bbd11989a62c53062874d1c292fc7f713450a11289559ec5885
 	sha512sums = SKIP
 
 pkgname = aif
+
diff --git a/PKGBUILD b/PKGBUILD
index df644d539b32..7c099f974c6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,27 +4,29 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # News updates for packages can be followed at https://devblog.square-r00t.net
 pkgname=aif
 pkgver=0.01
-pkgrel=1
+_pkgver=${pkgver}-BETA # currently at beta release
+pkgrel=2
 pkgdesc="An XML and python-driven rebirth of the AIF (Arch Installation Framework) project."
 arch=( 'i686' 'x86_64' )
 url="https://aif.square-r00t.net/"
 license=( 'GPL3' )
 depends=( 'python' 'arch-install-scripts' 'parted' 'gptfdisk' )
-optdepends=( 'python-lxml' )
-_pkgname=aif
-conflicts=( 'pkg''pkg')
+optdepends=( 'python-lxml: better XML handling' )
+_pkgname=AIF-NG
+conflicts=( 'aif-git' )
 install=
 changelog=
 noextract=()
-source=("https://git.square-r00t.net/AIF-NG/snapshot/AIF-NG-0.01-BETA.tar.xz"
-        "AIF-NG-0.01-BETA.tar.xz.sig")
+source=("${pkgname}-${pkgver}.tar.xz::https://git.square-r00t.net/${_pkgname}/snapshot/${_pkgname}-${_pkgver}.tar.xz"
+        "${pkgname}-${pkgver}.tar.xz.sig")
 sha512sums=('ed98f77116f80a06405a0be9efeecb2d0f78ff702577d0f7f8f407210c50316106a602cef28f3bbd11989a62c53062874d1c292fc7f713450a11289559ec5885'
             'SKIP')
-build() {
-        cd "${srcdir}/${_pkgname}/src"
-        make prefix=${pkgdir}/usr
-}
 package() {
-        install -D -m755 ${srcdir}/${_pkgname}/src/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
-        install -D -m644 ${srcdir}/${_pkgname}/docs/README.html.en ${pkgdir}/usr/share/doc/${_pkgname}/README.html
+        install -D -m0755 ${srcdir}/${_pkgname}-${_pkgver}/${pkgname}client.py ${pkgdir}/usr/bin/${pkgname}
+        install -D -m0755 ${srcdir}/${_pkgname}-${_pkgver}/${pkgname}verify.py ${pkgdir}/usr/bin/${pkgname}-verify
+        install -D -m0644 ${srcdir}/${_pkgname}-${_pkgver}/${pkgname}.xml ${pkgdir}/usr/share/doc/${pkgname}/${pkgname}.xml
+        install -D -m0644 ${srcdir}/${_pkgname}-${_pkgver}/${pkgname}.xsd ${pkgdir}/usr/share/doc/${pkgname}/${pkgname}.xsd
+        install -D -m0644 ${srcdir}/${_pkgname}-${_pkgver}/HOWTO ${pkgdir}/usr/share/doc/${pkgname}/HOWTO
+        install -D -m0644 ${srcdir}/${_pkgname}-${_pkgver}/TODO ${pkgdir}/usr/share/doc/${pkgname}/TODO
+	# TODO: xml linter, script samples. and docs, when i write them.
 }
diff --git a/AIF-NG-0.01-BETA.tar.xz.sig b/aif-0.01.tar.xz.sig
index 4a0d8da0d74c..4a0d8da0d74c 100644
--- a/AIF-NG-0.01-BETA.tar.xz.sig
+++ b/aif-0.01.tar.xz.sig