From e9bf008f56321da5eb60bd3b5e2c335e11ca97f8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 8 May 2020 01:57:26 +0000 Subject: [PATCH] import bsh-2.0~b6-3.module+el8.2.0+4938+c0cffa5b --- .bsh.metadata | 1 + .gitignore | 1 + SOURCES/bsh-java-9.patch | 11 ++ SOURCES/bsh-source-1.6.patch | 21 +++ SOURCES/generate-tarball.sh | 25 +++ SPECS/bsh.spec | 356 +++++++++++++++++++++++++++++++++++ 6 files changed, 415 insertions(+) create mode 100644 .bsh.metadata create mode 100644 .gitignore create mode 100644 SOURCES/bsh-java-9.patch create mode 100644 SOURCES/bsh-source-1.6.patch create mode 100755 SOURCES/generate-tarball.sh create mode 100644 SPECS/bsh.spec diff --git a/.bsh.metadata b/.bsh.metadata new file mode 100644 index 0000000..65058a5 --- /dev/null +++ b/.bsh.metadata @@ -0,0 +1 @@ +f4663ea0f648301b4d2b6c38a1bbbfb763e6d2f8 SOURCES/bsh-2.0-b6.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7bca279 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/bsh-2.0-b6.tar.gz diff --git a/SOURCES/bsh-java-9.patch b/SOURCES/bsh-java-9.patch new file mode 100644 index 0000000..165be5b --- /dev/null +++ b/SOURCES/bsh-java-9.patch @@ -0,0 +1,11 @@ +--- beanshell-2.0b6/src/bsh/util/AWTConsole.java~ 2016-02-05 18:16:07.000000000 +0100 ++++ beanshell-2.0b6/src/bsh/util/AWTConsole.java 2019-10-28 14:07:07.370526037 +0100 +@@ -212,7 +212,7 @@ + We have to get to the peer because TextComponent will refuse to + let us set us set a caret position greater than the text length. + Great. What a piece of crap. +- */ ++ // + public void setCaretPosition( int pos ) { + ((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( + pos + countNLs() ); diff --git a/SOURCES/bsh-source-1.6.patch b/SOURCES/bsh-source-1.6.patch new file mode 100644 index 0000000..c1ca364 --- /dev/null +++ b/SOURCES/bsh-source-1.6.patch @@ -0,0 +1,21 @@ +--- beanshell-2.0b6/build.xml~ 2016-02-05 18:16:07.000000000 +0100 ++++ beanshell-2.0b6/build.xml 2019-10-28 14:00:52.279528558 +0100 +@@ -170,7 +170,8 @@ + deprecation="${deprecation}" + optimize="on" + debug="on" +- target="1.5" ++ source="1.6" ++ target="1.6" + includes="**/*.java" + excludes="${excludes},**/bak/**" + > +@@ -213,7 +214,7 @@ + destdir="${javadoc-dir}" + author="true" + version="true" +- source="1.5" ++ source="1.6" + use="true" + windowtitle="BeanShell ${version}" + doctitle="<h1>BeanShell ${version}<h1>" diff --git a/SOURCES/generate-tarball.sh b/SOURCES/generate-tarball.sh new file mode 100755 index 0000000..4193830 --- /dev/null +++ b/SOURCES/generate-tarball.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e + +name=bsh +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/beanshell/beanshell/archive/${version/'~'}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +cd tarball-tmp +tar xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +rm -r */lib +find -name '*.jar' -delete +find -name '*.class' -delete +# Files marked as SUN PROPRIETARY/CONFIDENTAIL +rm -r */engine/javax-src + +# TODO Simply use ${version} without substitution when a newer version is available +tar czf "../${name}-${version/'~'/'-'}.tar.gz" * +cd .. +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/SPECS/bsh.spec b/SPECS/bsh.spec new file mode 100644 index 0000000..b14d679 --- /dev/null +++ b/SPECS/bsh.spec @@ -0,0 +1,356 @@ +%global upstream_version %(echo %{version} | tr -d '~') + +Name: bsh +Version: 2.0~b6 +Release: 3%{?dist} +Summary: Lightweight Scripting for Java +URL: http://www.beanshell.org/ +# bundled asm is BSD +# bsf/src/bsh/util/BeanShellBSFEngine.java is public-domain +License: ASL 2.0 and BSD and Public Domain +BuildArch: noarch +# ./generate-tarball.sh +# TODO Use proper %%{version} when a newer version is available +# TODO Also see TODO in ./generate-tarball.sh +Source0: %{name}-2.0-b6.tar.gz +# Remove bundled jars which cannot be easily verified for licensing +# Remove code marked as SUN PROPRIETARY/CONFIDENTAIL +Source2: generate-tarball.sh + +Patch0: %{name}-source-1.6.patch +Patch1: %{name}-java-9.patch + +BuildRequires: javapackages-local +BuildRequires: ant +BuildRequires: bsf +BuildRequires: junit +BuildRequires: javacc +BuildRequires: glassfish-servlet-api + +Provides: %{name}-utils = %{version}-%{release} + +# bsh uses small subset of modified (shaded) classes from ancient version of +# objecweb-asm under asm directory +Provides: bundled(objectweb-asm) = 1.3.6 + +%description +BeanShell is a small, free, embeddable, Java source interpreter with +object scripting language features, written in Java. BeanShell +executes standard Java statements and expressions, in addition to +obvious scripting commands and syntax. BeanShell supports scripted +objects as simple method closures like those in Perl and +JavaScript(tm). You can use BeanShell interactively for Java +experimentation and debugging or as a simple scripting engine for your +applications. In short: BeanShell is a dynamically interpreted Java, +plus some useful stuff. Another way to describe it is to say that in +many ways BeanShell is to Java as Tcl/Tk is to C: BeanShell is +embeddable - You can call BeanShell from your Java applications to +execute Java code dynamically at run-time or to provide scripting +extensibility for your applications. Alternatively, you can call your +Java applications and objects from BeanShell; working with Java +objects and APIs dynamically. Since BeanShell is written in Java and +runs in the same space as your application, you can freely pass +references to "real live" objects into scripts and return them as +results. + +%package manual +Summary: Manual for %{name} + +%description manual +Documentation for %{name}. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -n beanshell-%{upstream_version} +%patch0 -p1 +%patch1 -p1 + +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 + +%mvn_file : %{name} + +%build +mkdir lib +build-jar-repository lib bsf javacc junit glassfish-servlet-api + +ant test dist + +%install +%mvn_artifact pom.xml dist/%{name}-%{upstream_version}.jar + +%mvn_install -J javadoc + +%files -f .mfiles +%license LICENSE NOTICE +%doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html + +%files manual +%doc docs/manual/html +%doc docs/manual/images/*.jpg +%doc docs/manual/images/*.gif +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0~b6-3 +- Mass rebuild for javapackages-tools 201902 + +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0~b6-2 +- Drop launcher scripts and servlet + +* Mon Sep 16 2019 Marian Koncek - 2.0~b6-1 +- Use tilde versioning + +* Fri May 24 2019 Mikolaj Izdebski - 2.0-14.b6 +- Mass rebuild for javapackages-tools 201901 + +* 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. + +* Mon Jul 30 2018 Michael Simacek - 0:2.0-11.b6 +- Repack the tarball without binaries + +* Thu Jul 12 2018 Fedora Release Engineering - 0:2.0-10.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0:2.0-9.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Sep 23 2017 Mikolaj Izdebski - 0:2.0-8.b6 +- Properly conditionalize build-requires + +* Wed Jul 26 2017 Fedora Release Engineering - 0:2.0-7.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jun 13 2017 Michael Simacek - 0:2.0-6.b6 +- Add conditional for desktop file + +* Fri Mar 3 2017 Mikolaj Izdebski - 0:2.0-5.b6 +- Install desktop icon to pixmaps instead of icons + +* Fri Mar 3 2017 Mikolaj Izdebski - 0:2.0-4.b6 +- Fix directory ownership + +* Tue Feb 07 2017 Michael Simacek - 0:2.0-3.b6 +- Build against glassfish-servlet-api + +* Thu Nov 24 2016 Michael Simacek - 0:2.0-2.b6 +- Install into expected location + +* Thu Nov 24 2016 Michael Simacek - 0:2.0-1.b6 +- Update to upstream version 2.0.b6 + +* Wed Oct 12 2016 Ville Skyttä - 0:1.3.0-36 +- Switch to jline 2.x in -utils +- Mark License.txt as %%license + +* Thu Jul 21 2016 Michael Simacek - 0:1.3.0-35 +- Replace perl usage with sed + +* Wed Feb 03 2016 Fedora Release Engineering - 0:1.3.0-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0:1.3.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Nov 5 2014 Mikolaj Izdebski - 0:1.3.0-32 +- Remove workaround for RPM bug #646523 + +* Sat Jun 07 2014 Fedora Release Engineering - 0:1.3.0-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Mikolaj Izdebski - 0:1.3.0-30 +- Use .mfiles generated during build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.3.0-29 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Oct 30 2013 Michal Srb - 0:1.3.0-28 +- Switch to jline1 (Resolves rhbz#1023018) + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.3.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 12 2013 Mikolaj Izdebski - 0:1.3.0-26 +- Use %%add_maven_depmap instead of legacy macros +- Install versionless javadocs +- Remove old Obsoletes +- Update and format descriptions +- Install license file with manual and javadoc packages +- Fix Requires and BuildRequires on java +- Fix calls to %%jpackage_script + +* Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 +- Remove arch-specific conditionals +- Remove group tags +- Remove Requires on jpackage-utils +- Remove Requires on coreutils +- Generate custom scripts with %%jpackage_script +- Install versionless JARs only +- Install POM files to %%{_mavenpomdir} + +* Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 +- Enable tests +- Fix BR + +* Thu Feb 14 2013 Rahul Sundaram - 0:1.3.0-24 +- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 +- clean up spec to follow current guidelines + +* Wed Feb 13 2013 Fedora Release Engineering - 0:1.3.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 20 2012 David Tardon - 0:1.3.0-22 +- Resolves: rhbz#850008 bsh - Should not own /usr/share/maven-fragments + directory +- Resolves: rhbz#878163 bsh - javadoc subpackage doesn't require + jpackage-utils +- Resolves: rhbz#878166 bsh: Public Domain not listed in license tag + +* Thu Nov 1 2012 Mikolaj Izdebski - 0:1.3.0-21 +- Add additional maven depmap + +* Wed Jul 18 2012 Fedora Release Engineering - 0:1.3.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 0:1.3.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.3.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Nov 25 2010 Ville Skyttä - 0:1.3.0-17 +- Rename -desktop to -utils, move shell scripts and menu entry to it (#417491). +- Bring icon cache scriptlets up to date with current guidelines. +- Use jline in bsh script for command history support. +- Prefer JRE over SDK when finding JVM to invoke in scripts. +- Build with -source 1.5. + +* Thu Nov 25 2010 Stanislav Ochotnicky - 0:1.3.0-16 +- Fix pom filenames (Resolves rhbz#655791) +- Fix xsl errors when building docs + +* Sat Jan 9 2010 Alexander Kurtakov 0:1.3.0-15.2 +- Drop gcj_support. +- Fix rpmlint warnings. + +* Mon Sep 21 2009 Permaine Cheung 0:1.3.0-15.1 +- Do not build manual and faq for ppc64 or s390x as the style task is disabled + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.3.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 0:1.3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.3.0-13 +- drop repotag +- fix license tag + +* Mon Mar 10 2008 Permaine Cheung 0:1.3.0-12jpp.3 +- Fix bugzilla 436675. Separate menu entry into desktop subpackage. + +* Thu Mar 06 2008 Permaine Cheung 0:1.3.0-12jpp.2 +- Fix bugzilla 417491. Thanks Ville Skytta for the patch. +- Add menu entry and startup script for bsh desktop. +- Ensure scriptlets exit with zero exit status. + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.3.0-12jpp.1 +- Autorebuild for GCC 4.3 + +* Mon Jan 21 2008 Permaine Cheung 0:1.3.0-11jpp.1 +- Merge with upstream + +* Thu Jul 12 2007 Ralph Apel 0:1.3.0-11jpp +- Fix aot build +- Add pom and depmap frags +- Restore all jars +- Add webapps + +* Fri Mar 16 2007 Permaine Cheung 0:1.3.0-10jpp.1 +- Merge with upstream +- Removed unapplied patch and moved buildroot removal from prep to install, + and other rpmlint cleanup + +* Mon Mar 12 2007 Karsten Hopp 1.3.0-9jpp.2 +- add buildrequirement ant-trax for documentation + +* Fri Aug 04 2006 Deepak Bhole 0:1.3.0-9jpp.1 +- Added missing requirements + +* Sat Jul 22 2006 Jakub Jelinek 0:1.3.0-8jpp_3fc +- Rebuilt + +* Fri Jul 21 2006 Deepak Bhole 0:1.3.0-8jpp_2fc +- Removing vendor and distribution tags. + +* Thu Jul 20 2006 Deepak Bhole 0:1.3.0-8jpp_1fc +- Add conditional native compilation. + +* Thu May 04 2006 Ralph Apel 0:1.3.0-7jpp +- First JPP-1.7 release + +* Fri Aug 20 2004 Ralph Apel 0:1.3.0-6jpp +- Build with ant-1.6.2 + +* Mon Jan 26 2004 David Walluck 0:1.3.0-5jpp +- really drop readline patch + +* Sun Jan 25 2004 David Walluck 0:1.3.0-4jpp +- drop readline patch + +* Wed Jan 21 2004 David Walluck 0:1.3.0-3jpp +- port libreadline-java patch to new bsh + +* Tue Jan 20 2004 David Walluck 0:1.3.0-2jpp +- add Distribution tag + +* Tue Jan 20 2004 David Walluck 0:1.3.0-1jpp +- 1.3.0 +- remove bsf patch (fixed upstream) +- add epoch to demo package Requires + +* Sat Apr 12 2003 David Walluck 0:1.2-0.b8.4jpp +- fix strange permissions + +* Fri Apr 11 2003 David Walluck 0:1.2-0.b8.3jpp +- rebuild for JPackage 1.5 +- add bsf patch + +* Sat Feb 01 2003 David Walluck 1.2-0.b8.2jpp +- remove servlet dependency (if anyone wants to add this as a separate + package and do the tomcat integration, be my guest) + +* Thu Jan 23 2003 David Walluck 1.2-0.b8.1jpp +- rename to bsh +- add manual +- add Changes.html to %%doc +- add bsh and bshdoc scripts +- add %%dir %%{_datadir}/%%{name} to main package +- correct test interpreter and make bsh files executable + +* Mon Jan 21 2002 Guillaume Rousse 1.01-3jpp +- really section macro + +* Sun Jan 20 2002 Guillaume Rousse 1.01-2jpp +- additional sources in individual archives +- versioned dir for javadoc +- no dependencies for javadoc package +- stricter dependency for demo package +- section macro + +* Tue Dec 18 2001 Guillaume Rousse 1.01-1jpp +- first JPackage release