From 6ae8eed9e8b86f4e1bd2401d9bc11136c9148484 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 22 Jun 2018 00:30:30 +0200
Subject: Updated build scripts

---
 scripts/jss-build.sh         | 29 +----------------------------
 scripts/jss-install.sh       |  2 +-
 scripts/pki-build.sh         |  2 --
 scripts/tomcatjss-build.sh   | 21 +--------------------
 scripts/tomcatjss-install.sh |  6 +-----
 5 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/scripts/jss-build.sh b/scripts/jss-build.sh
index 1877fe7..5ae587b 100755
--- a/scripts/jss-build.sh
+++ b/scripts/jss-build.sh
@@ -1,30 +1,3 @@
 #!/bin/sh -x
 
-version=4.4.1
-archive=jss-$version.tar.gz
-
-SRC_DIR=`cd ../.. ; pwd`
-
-cd $SRC_DIR/jss
-
-git archive --format=tar.gz --prefix jss-$version/jss/ -o ../jss-fedora/$archive -v HEAD
-
-cd $SRC_DIR/jss-fedora
-
-checksum=`sha512sum $archive | awk '{print $1;}'`
-sed -ri "s/SHA512 \(($archive)\) = .*/SHA512 \(\1\) = $checksum/" sources
-
-#fedpkg local
-
-#dnf reinstall -y x86_64/jss-$version-1.fc27.x86_64.rpm
-
-#rm -rf jss/bin
-#gendiff jss .original > ~/rpmbuild/SOURCES/jss-debug.patch
-
-#rpmbuild -bb ~/rpmbuild/SPECS/jss.spec
-
-#export JAVA_HOME=/etc/alternatives/java_sdk_1.8.0_openjdk
-#export USE_64=1
-#export USE_INSTALLED_NSPR=1
-#export USE_INSTALLED_NSS=1
-#perl build_java.pl
+../../jss/build.sh --with-timestamp --with-commit-id "$@"
diff --git a/scripts/jss-install.sh b/scripts/jss-install.sh
index 003bb9e..809b046 100755
--- a/scripts/jss-install.sh
+++ b/scripts/jss-install.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-rpm -Uvh --force ~/rpmbuild/RPMS/x86_64/jss-*
+dnf install -y `find $HOME/build/jss/RPMS -type f`
diff --git a/scripts/pki-build.sh b/scripts/pki-build.sh
index ea95e57..e1f8385 100755
--- a/scripts/pki-build.sh
+++ b/scripts/pki-build.sh
@@ -1,5 +1,3 @@
 #!/bin/sh -x
 
-# ../../pki/build.sh --with-timestamp --with-commit-id --without-server --without-javadoc --without-test "$@"
-
 ../../pki/build.sh --with-timestamp --with-commit-id "$@"
diff --git a/scripts/tomcatjss-build.sh b/scripts/tomcatjss-build.sh
index 0bc8ef1..68b877f 100755
--- a/scripts/tomcatjss-build.sh
+++ b/scripts/tomcatjss-build.sh
@@ -1,22 +1,3 @@
 #!/bin/sh -x
 
-version=7.2.2
-archive=tomcatjss-$version.tar.gz
-
-SRC_DIR=`cd ../.. ; pwd`
-
-cd $SRC_DIR/tomcatjss
-
-git archive --format=tar.gz --prefix tomcatjss-$version/ -o ../tomcatjss-fedora/$archive -v HEAD
-
-cd $SRC_DIR/tomcatjss-fedora
-
-checksum=`sha512sum $archive | awk '{print $1;}'`
-sed -ri "s/SHA512 \($archive\) = .*/SHA512 \($archive\) = $checksum/" sources
-
-#fedpkg local
-
-#dnf reinstall -y ../tomcatjss-fedora/noarch/tomcatjss-$version-*.rpm
-
-#./build_tomcatjss
-#ant install
+../../tomcatjss/build.sh --with-timestamp --with-commit-id "$@"
diff --git a/scripts/tomcatjss-install.sh b/scripts/tomcatjss-install.sh
index cc3b7e5..e25681f 100755
--- a/scripts/tomcatjss-install.sh
+++ b/scripts/tomcatjss-install.sh
@@ -1,7 +1,3 @@
 #!/bin/sh -x
 
-SRC_DIR=`cd ../.. ; pwd`
-
-cd $SRC_DIR/tomcatjss
-
-rpm -ivh --force dist/rpmpkg/RPMS/noarch/tomcatjss-*
+dnf install -y `find $HOME/build/tomcatjss/RPMS -type f`
-- 
cgit