torch7-nn-git: install license, add .gitignore

Signed-off-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>

3 files changed, 37 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ca96a0609bc..05024924de7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
-# Generated by mksrcinfo v8
-# Sun Aug 28 09:15:59 UTC 2016
 pkgbase = torch7-nn-git
 	pkgdesc = Neural networks package for Torch7
-	pkgver = r1484.b56f0c0
+	pkgver = r1839.8726825
 	pkgrel = 1
 	url = https://github.com/torch/nn
 	arch = x86_64
 	arch = i686
-	license = BSD
+	license = custom
 	makedepends = cmake
 	makedepends = git
 	depends = torch7-git>=r819
 	provides = torch7-nn
 	conflicts = torch7-nn
-	source = torch7-nn-git::git+https://github.com/torch/nn
-	sha512sums = SKIP
+	source = torch7-nn::git+https://github.com/torch/nn
+	b2sums = SKIP
 
 pkgname = torch7-nn-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 0bfce4665a4d..f6fc2bf941b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,44 @@
-# Maintainer: Adrián Pérez de Castro <aperez@igalia.com>
-pkgdesc='Neural networks package for Torch7'
-pkgname='torch7-nn-git'
-pkgver=r1484.b56f0c0
+# Maintainer: éclairevoyant
+# Contributor: Adrián Pérez de Castro <aperez at igalia dot com>
+
+_pkgname=torch7-nn
+pkgname="$_pkgname-git"
+pkgver=r1839.8726825
 pkgrel=1
-makedepends=('cmake' 'git')
-depends=('torch7-git>=r819')
-conflicts=('torch7-nn')
-provides=('torch7-nn')
+pkgdesc='Neural networks package for Torch7'
 arch=('x86_64' 'i686')
 url='https://github.com/torch/nn'
-license=('BSD')
-source=("${pkgname}::git+${url}")
-sha512sums=('SKIP')
+license=('custom')
+depends=('torch7-git>=r819')
+makedepends=('cmake' 'git')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=("$_pkgname::git+$url")
+b2sums=('SKIP')
 
-pkgver () {
-	cd "${pkgname}"
-	(
-		set -o pipefail
-		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-	)
+pkgver() {
+	cd $_pkgname
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-build () {
-	cd "${pkgname}"
+build() {
+	cd $_pkgname
 	cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
 	make
 }
 
-package () {
-	cd "${pkgname}"
-	make DESTDIR="${pkgdir}" install
+package() {
+	cd $_pkgname
+	make DESTDIR="$pkgdir" install
 
 	# Move Lua C module
-	mkdir -p "${pkgdir}/usr/lib/lua/5.1"
-	mv "${pkgdir}/usr/lib/libTHNN.so" "${pkgdir}/usr/lib/lua/5.1/"
+	install -dm755 "$pkgdir/usr/lib/lua/5.1/"
+	mv "$pkgdir/usr/lib/libTHNN.so" "$pkgdir/usr/lib/lua/5.1/"
 
 	# Move pure Lua modules
-	mkdir -p "${pkgdir}/usr/share/lua/5.1"
-	mv "${pkgdir}/usr/lua/nn" "${pkgdir}/usr/share/lua/5.1/"
-	rm -rf "${pkgdir}/usr/lua"
+	install -dm755 "$pkgdir/usr/share/lua/5.1/"
+	mv "$pkgdir/usr/lua/nn" "${pkgdir}/usr/share/lua/5.1/"
+	rm -rf "$pkgdir/usr/lua"
+
+	install -Dm644 COPYRIGHT.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }