Initial commit

4 files changed, 22 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c6ce069f3d6..566355e8430c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = tuprolog
 	pkgdesc = A light-weight Prolog system for distributed applications and infrastructures.
-	pkgver = 3.0.1
+	pkgver = 4.1.1
 	pkgrel = 1
 	url = http://apice.unibo.it/xwiki/bin/view/Tuprolog/
 	arch = any
 	license = LGPL
+	makedepends = gendesk
 	depends = java-runtime
-	source = https://bitbucket.org/tuprologteam/tuprolog/downloads/2p-3.0.1.zip
-	source = 2p
-	source = 2p.desktop
-	sha256sums = 7f9a382d6c8dd968626362e8b72f406886459d638d88a4ea590b04598148e03a
-	sha256sums = b817724b0e860ee579606f67cbcb10487d3bd46d66dc5e910aaa671f5656db03
-	sha256sums = f6d433993a53c209fbbf38b3e9b9dc47e6fa7bdf5d1234938d74e287af84da51
+	depends = bash
+	provides = tuprolog
+	noextract = tuprolog-4.1.1.tar.gz
+	source = tuprolog-4.1.1.jar::https://gitlab.com/pika-lab/tuprolog/2p/wikis/uploads/87b96d15ce4a1c42ac9825883fd3cfdd/2p-4.0.3.jar
+	sha256sums = c7694d724f70c06544e4c360cc4bdacad0717974b8f721ae0e2c2cddcc477f2c
 
 pkgname = tuprolog
 
diff --git a/2p b/2p
deleted file mode 100755
index 8904f1702895..000000000000
--- a/2p
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java -jar '/usr/share/java/tuprolog/2p.jar' "$@"
diff --git a/2p.desktop b/2p.desktop
deleted file mode 100644
index be2a5ff5b025..000000000000
--- a/2p.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=tuProlog
-Comment=Prolog system
-Exec=2p
-Icon=2p
-Terminal=false
-Categories=Education;Science;Java;
diff --git a/PKGBUILD b/PKGBUILD
index a655f73d1426..96848f750e02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,25 @@
+# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+
 pkgname=tuprolog
-pkgver=3.0.1
+pkgver=4.1.1
 pkgrel=1
 pkgdesc='A light-weight Prolog system for distributed applications and infrastructures.'
 arch=('any')
 url='http://apice.unibo.it/xwiki/bin/view/Tuprolog/'
 license=('LGPL')
-depends=('java-runtime')
-source=("https://bitbucket.org/tuprologteam/tuprolog/downloads/2p-$pkgver.zip"
-        '2p'
-        '2p.desktop')
-sha256sums=('7f9a382d6c8dd968626362e8b72f406886459d638d88a4ea590b04598148e03a'
-            'b817724b0e860ee579606f67cbcb10487d3bd46d66dc5e910aaa671f5656db03'
-            'f6d433993a53c209fbbf38b3e9b9dc47e6fa7bdf5d1234938d74e287af84da51')
+provides=('tuprolog')
+depends=('java-runtime' 'bash')
+makedepends=('gendesk')
+source=("${pkgname}-${pkgver}.jar::https://gitlab.com/pika-lab/tuprolog/2p/wikis/uploads/87b96d15ce4a1c42ac9825883fd3cfdd/2p-4.0.3.jar")
+noextract=("${pkgname}-${pkgver}.tar.gz")
+sha256sums=('c7694d724f70c06544e4c360cc4bdacad0717974b8f721ae0e2c2cddcc477f2c')
 
 package() {
-  cd "$srcdir"
-
-  install -d "$pkgdir/usr/share/doc/tuprolog"
-  cp -dpr --no-preserve=ownership "2p-$pkgver/doc/examples" "2p-$pkgver/doc/javadoc" "$pkgdir/usr/share/doc/tuprolog/"
-
-  install -d "$pkgdir/usr/share/java/tuprolog"
-  install -m644 "2p-$pkgver/bin/2p.jar" "2p-$pkgver/bin/tuprolog.jar" "$pkgdir/usr/share/java/tuprolog/"
-
+  echo "#!/bin/sh
+exec /usr/bin/java -jar '/usr/share/java/tuprolog/2p.jar' \"\$\@\"" > "2p"
+  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --exec=2p \
+   --categories=Education\;Science\;Java --icon "${_pkgname}"
+  install -Dm755 ${pkgname}-${pkgver}.jar "${pkgdir}/usr/share/java/tuprolog/2p.jar"
   install -Dm755 2p "$pkgdir/usr/bin/2p"
-  install -Dm644 2p.desktop "$pkgdir/usr/share/applications/2p.desktop"
+  install -Dm644 tuprolog.desktop "$pkgdir/usr/share/applications/2p.desktop"
 }