diff --git a/bsh.spec b/bsh.spec index 0ebb516..960bf21 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 12.%{reltag}%{?dist} +Release: 13.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -45,6 +45,7 @@ BuildArch: noarch Source0: %{name}-%{version}-%{reltag}.tar.gz Source1: %{name}-desktop.desktop # Remove bundled jars which cannot be easily verified for licensing +# Remove code marked as SUN PROPRIETARY/CONFIDENTAIL Source2: generate-tarball.sh BuildRequires: javapackages-local @@ -109,9 +110,6 @@ This package provides %{summary}. %prep %setup -q -n beanshell-%{version}%{reltag} -# those are now included in JDK itself -rm -r engine/javax-src - sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl %mvn_alias :bsh bsh:bsh bsh:bsh-bsf org.beanshell:bsh @@ -172,6 +170,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Fri Aug 03 2018 Michael Simacek - 0:2.0-13.b6 +- Remove proprietary files from tarball + * Mon Jul 30 2018 Severin Gehwolf - 0:2.0-12.b6 - Add requirement on javapackages-tools for script's usage of java-functions. diff --git a/generate-tarball.sh b/generate-tarball.sh index 78b7226..bf091f9 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -17,6 +17,8 @@ tar xf "../${name}-${version}-${reltag}.orig.tar.gz" rm -r */lib find -name '*.jar' -delete find -name '*.class' -delete +# Files marked as SUN PROPRIETARY/CONFIDENTAIL +rm -r */engine/javax-src tar cf "../${name}-${version}-${reltag}.tar.gz" * cd .. diff --git a/sources b/sources index b81a685..c02c0d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bsh-2.0-b6.tar.gz) = ac65c24fefc9bd46b821b6292f9db35766fc1ad46091baac96c77f131950e6605dee9bf80d9faf1488fd837a0bccab31c466040474805f2bb4b1839acfd2148c +SHA512 (bsh-2.0-b6.tar.gz) = 22e920fa78d2117cc27074f12a12246cb2923b1d308736b2ed5fd2faa9bbc8b77b4991abc862097cce4e9de473c17a9d9a85ee5bdab5462f4a92c64c3d49bfc1