From 8a25fd8e8a43733ac5d3cfc304213090967a3c0c Mon Sep 17 00:00:00 2001
From: Giorgio Peron <giorgio.peron@gmail.com>
Date: Thu, 17 Dec 2015 04:07:48 +0700
Subject: system/jenkins: Updated for version 1.641.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/jenkins/jenkins.SlackBuild | 19 +++++++++++--------
 system/jenkins/jenkins.info       |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'system/jenkins')

diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild
index ad4c79d7a1..9b714713f5 100644
--- a/system/jenkins/jenkins.SlackBuild
+++ b/system/jenkins/jenkins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jenkins
 
-# Copyright 2014  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
+# Copyright 2015  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jenkins
-VERSION=${VERSION:-1.552}
+VERSION=${VERSION:-1.641}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,6 +55,7 @@ cd $PKG
 
 mkdir -p $PKG/usr/share/$PRGNAM
 cp $CWD/$PRGNAM.war $PKG/usr/share/$PRGNAM/$PRGNAM.war
+chown -R jenkins.jenkins $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/bin
 cat $CWD/files/jenkins.bin.sh > $PKG/usr/bin/jenkins
@@ -63,6 +64,8 @@ chmod 0755 $PKG/usr/bin/*
 
 mkdir -p $PKG/etc/$PRGNAM
 cp $CWD/files/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new
+JAVAEXEC=`which java`
+sed -i "s|#JAVA=/usr/lib/java/bin/java|#JAVA=${JAVAEXEC}|" $PKG/etc/$PRGNAM/$PRGNAM.conf.new
 
 mkdir -p $PKG/etc/logrotate.d
 cp $CWD/files/logrotate.$PRGNAM $PKG/etc/logrotate.d/$PRGNAM.new
@@ -71,18 +74,18 @@ mkdir -p $PKG/etc/rc.d
 cp $CWD/files/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 
 mkdir -p $PKG/var/lib/$PRGNAM/apps
-chown jenkins.jenkins $PKG/var/lib/jenkins
+chown jenkins.jenkins $PKG/var/lib/$PRGNAM
 
 mkdir -p $PKG/var/log/$PRGNAM
-touch $PKG/var/log/jenkins/jenkins.log.new
-touch $PKG/var/log/jenkins/jenkins_console.log.new
-chown -R jenkins.jenkins $PKG/var/log/jenkins
+touch $PKG/var/log/$PRGNAM/jenkins.log.new
+touch $PKG/var/log/$PRGNAM/jenkins_console.log.new
+chown -R jenkins.jenkins $PKG/var/log/$PRGNAM
 
 # We can't depend on this directory persisting across reboots, since /var/run
 # is often on tmpfs (or even linked to /run), so we'll create this in the
 # init script's start() function too...   --rworkman
-mkdir -p $PKG/var/run/jenkins
-chown jenkins:jenkins $PKG/var/run/jenkins
+mkdir -p $PKG/var/run/$PRGNAM
+chown jenkins:jenkins $PKG/var/run/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info
index 57f65583b8..072bfb8e21 100644
--- a/system/jenkins/jenkins.info
+++ b/system/jenkins/jenkins.info
@@ -1,8 +1,8 @@
 PRGNAM="jenkins"
-VERSION="1.552"
+VERSION="1.641"
 HOMEPAGE="http://jenkins-ci.org"
-DOWNLOAD="http://ftp.icm.edu.pl/packages/jenkins/war/1.552/jenkins.war"
-MD5SUM="25b13d05a16008ecb8133121292e7a64"
+DOWNLOAD="http://ftp.icm.edu.pl/packages/jenkins/war/1.641/jenkins.war"
+MD5SUM="5fc8e9452ebdaa012eb9e2f0400814d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-- 
cgit v1.2.3