Switch to standalone jar and add pgp checks

3 files changed, 44 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 233bd766b843..ae51fad49c7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,27 @@
 # Generated by mksrcinfo v8
-# Tue Feb  9 09:22:03 UTC 2016
+# Tue Apr 19 10:56:46 UTC 2016
 pkgbase = leiningen
 	pkgdesc = Automating Clojure projects without setting your hair on fire.
 	pkgver = 2.6.1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
-	url = http://github.com/technomancy/leiningen
+	url = https://github.com/technomancy/leiningen
+	install = leiningen.install
 	arch = any
 	license = EPL
 	depends = java-environment
 	depends = bash
 	optdepends = rlwrap: for readline support
 	optdepends = leiningen-completions: completion scripts
-	source = https://raw.github.com/technomancy/leiningen/f9a464e008214941e93c046413004517325818bb/bin/lein
+	noextract = leiningen-2.6.1-standalone.zip
+	source = https://raw.github.com/technomancy/leiningen/f9a464e008214941e93c046413004517325818bb/bin/lein-pkg
 	source = https://raw.github.com/technomancy/leiningen/f9a464e008214941e93c046413004517325818bb/doc/lein.1
-	sha1sums = ef30f53be163b01eeb9b533dd940b17532353337
-	sha1sums = 290b634c0648e0710911aeee71f795401af6b2e7
+	source = https://github.com/technomancy/leiningen/releases/download/2.6.1/leiningen-2.6.1-standalone.zip
+	source = https://github.com/technomancy/leiningen/releases/download/2.6.1/leiningen-2.6.1-standalone.zip.asc
+	sha256sums = e84d15b45871fdb0308fec85786d6df8aefcc51482efa299086aad6706cdb1d9
+	sha256sums = fda89b8383c9df97c007fcf6b7ef045cf357bd660db03400a96ef14996a3d580
+	sha256sums = d70078fba85d5f405d042a6d7bad3a1e5b4aafae565c2d581feb999e95ae6394
+	sha256sums = SKIP
 
 pkgname = leiningen
 
diff --git a/PKGBUILD b/PKGBUILD
index b627228c24e8..08e0164fe2b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,35 @@
 # Maintainer: Tobias Frilling <tobias@frilling-online.de>
+
 pkgname=leiningen
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Automating Clojure projects without setting your hair on fire."
 arch=('any')
-url="http://github.com/technomancy/leiningen"
+url="https://github.com/technomancy/leiningen"
 license=("EPL")
 depends=('java-environment' 'bash')
 optdepends=('rlwrap: for readline support'
             'leiningen-completions: completion scripts')
+install="leiningen.install"
 
 _commit="f9a464e008214941e93c046413004517325818bb"
-source=("https://raw.github.com/technomancy/leiningen/${_commit}/bin/lein"
-        "https://raw.github.com/technomancy/leiningen/${_commit}/doc/lein.1")
-sha1sums=('ef30f53be163b01eeb9b533dd940b17532353337'
-          '290b634c0648e0710911aeee71f795401af6b2e7')
+source=("https://raw.github.com/technomancy/leiningen/${_commit}/bin/lein-pkg"
+        "https://raw.github.com/technomancy/leiningen/${_commit}/doc/lein.1"
+        "${url}/releases/download/${pkgver}/leiningen-${pkgver}-standalone.zip"
+        "${url}/releases/download/${pkgver}/leiningen-${pkgver}-standalone.zip.asc")
+noextract=("leiningen-${pkgver}-standalone.zip")
 
 package() {
   cd ${srcdir}
-  install -m 755 -D lein ${pkgdir}/usr/bin/lein
-  install -D "${srcdir}"/lein.1 "${pkgdir}"/usr/share/man/man1/lein.1
+  install -m 755 -D lein-pkg ${pkgdir}/usr/bin/lein
+  install -D lein.1 ${pkgdir}/usr/share/man/man1/lein.1
+  install -D leiningen-${pkgver}-standalone.zip \
+             ${pkgdir}/usr/share/java/leiningen-${pkgver}-standalone.jar
+
 }
+
+sha256sums=('e84d15b45871fdb0308fec85786d6df8aefcc51482efa299086aad6706cdb1d9'
+            'fda89b8383c9df97c007fcf6b7ef045cf357bd660db03400a96ef14996a3d580'
+            'd70078fba85d5f405d042a6d7bad3a1e5b4aafae565c2d581feb999e95ae6394'
+            'SKIP')
diff --git a/leiningen.install b/leiningen.install
new file mode 100644
index 000000000000..8ea709084499
--- /dev/null
+++ b/leiningen.install
@@ -0,0 +1,13 @@
+all_off="$(tput sgr0)"
+bold="${all_off}$(tput bold)"
+blue="${bold}$(tput setaf 4)"
+yellow="${bold}$(tput setaf 3)"
+
+note() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
+post_upgrade() {
+	 note "Since version 2.6.1-2 this package installs a standalone leiningen.jar"
+   note "So you might want to remove ~/.lein/self-installs"
+}