From 30d52d23d80093c111c0b0c272195e7300433de3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Nov 05 2019 14:06:13 +0000
Subject: Drop launcher scripts and servlet


---

diff --git a/bsh.spec b/bsh.spec
index 5d89316..f411d1c 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -1,38 +1,8 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 %global upstream_version %(echo %{version} | tr -d '~')
 
 Name:           bsh
 Version:        2.0~b6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight Scripting for Java
 URL:            http://www.beanshell.org/
 # bundled asm is BSD
@@ -57,14 +27,6 @@ BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  glassfish-servlet-api
 
-Requires:       java-headless
-Requires:       bsf
-Requires:       jline
-# Explicit javapackages-tools requires since scripts use
-# /usr/share/java-utils/java-functions
-Requires:       javapackages-tools
-
-
 Provides:       %{name}-utils = %{version}-%{release}
 
 # bsh uses small subset of modified (shaded) classes from ancient version of
@@ -125,25 +87,9 @@ ant test dist
 
 %mvn_install -J javadoc
 
-install -d -m 755 %{buildroot}%{_datadir}/%{name}
-install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps
-install -m 644 dist/bshservlet.war %{buildroot}%{_datadir}/%{name}/webapps
-install -m 644 dist/bshservlet-wbsh.war %{buildroot}%{_datadir}/%{name}/webapps
-
-# scripts
-install -d %{buildroot}%{_bindir}
-
-%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline %{name} true
-%jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" bsh bsh-console true
-
-echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc
-cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
-
 %files -f .mfiles
 %license LICENSE NOTICE
 %doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html
-%attr(0755,root,root) %{_bindir}/%{name}*
-%{_datadir}/%{name}
 
 %files manual
 %doc docs/manual/html
@@ -155,6 +101,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0~b6-2
+- Drop launcher scripts and servlet
+
 * Mon Sep 16 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~b6-1
 - Use tilde versioning