From 4c2e42d32d35e3082dd375f09ed6236308ea7dc6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 13:58:15 +0000 Subject: [PATCH 01/93] Initialize branch F-9 for bsh --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From bfafa30b1e6fd8c30bbf0e82fb2f60750b071e04 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 9 Jul 2008 17:15:38 +0000 Subject: [PATCH 02/93] fix repotag --- bsh.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index d77ba5e..aa4a9e0 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,10 +32,10 @@ Name: bsh Version: 1.3.0 -Release: 12jpp.3%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java -License: LGPL +License: SPL or LGPLv2+ Source0: %{name}-%{version}-src.tar.bz2 #cvs -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell login #cvs -z3 -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell export -r rel_1_3_0_final BeanShell @@ -349,6 +349,10 @@ exit 0 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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. From 80186ce0cdba57b8649b19e7b81bbe66c0905d16 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 05:56:44 +0000 Subject: [PATCH 03/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index aa4a9e0..0113939 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,7 +32,7 @@ Name: bsh Version: 1.3.0 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -349,6 +349,9 @@ exit 0 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 9782ec05589db1ae3a71105bc813a91124bacc57 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 18:27:06 +0000 Subject: [PATCH 04/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 0113939..3a5c0c2 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,7 +32,7 @@ Name: bsh Version: 1.3.0 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -349,6 +349,9 @@ exit 0 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From bd0eeaf59ab666658b46f3566e4337d0e030a11f Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Mon, 21 Sep 2009 18:03:46 +0000 Subject: [PATCH 05/93] Do not build manual and faq for ppc64 or s390x as the style task is disabled --- bsh.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bsh.spec b/bsh.spec index 3a5c0c2..12c9608 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,7 +32,7 @@ Name: bsh Version: 1.3.0 -Release: 15%{?dist} +Release: 15.1%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -136,9 +136,11 @@ pushd lib ln -sf $(build-classpath bsf) ln -sf $(build-classpath servlet) popd -ant dist -(cd docs/faq && ant) -(cd docs/manual && ant) +ant -Dant.build.javac.source=1.4 dist +%ifnarch ppc64 s390x +(cd docs/faq && ant -Dant.build.javac.source=1.4) +(cd docs/manual && ant -Dant.build.javac.source=1.4) +%endif %install rm -rf $RPM_BUILD_ROOT @@ -175,9 +177,11 @@ find docs -name ".cvswrappers" -exec rm -f {} \; find docs -name "*.xml" -exec rm -f {} \; find docs -name "*.xsl" -exec rm -f {} \; find docs -name "*.log" -exec rm -f {} \; +%ifnarch ppc64 s390x (cd docs/manual && mv html/* .) (cd docs/manual && rm -rf html) (cd docs/manual && rm -rf xsl) +%endif # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} @@ -329,9 +333,11 @@ exit 0 %attr(-,root,root) %{_libdir}/gcj/%{name} %endif +%ifnarch ppc64 s390x %files manual %defattr(-,root,root) %doc docs/* +%endif %files javadoc %defattr(-,root,root) @@ -349,6 +355,9 @@ exit 0 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 0b103a97c0b8f6213aa42a8ea05cab94fc421547 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:46:08 +0000 Subject: [PATCH 06/93] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f11a30d..ccb6555 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := bsh SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5e501f54fc24b84b834d11e89ac9668fd07fa88c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:45 +0000 Subject: [PATCH 07/93] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f11a30d..ccb6555 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := bsh SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 065175bd11f19f805a81c1ed225c2966d3b1d19b Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Sat, 9 Jan 2010 13:50:46 +0000 Subject: [PATCH 08/93] Drop gcj support. Fix rpmlint warnings. --- bsh.spec | 56 +++++++++++++------------------------------------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/bsh.spec b/bsh.spec index 12c9608..7d84efc 100644 --- a/bsh.spec +++ b/bsh.spec @@ -28,11 +28,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define gcj_support 1 - Name: bsh Version: 1.3.0 -Release: 15.1%{?dist} +Release: 15.2%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -51,19 +49,11 @@ BuildRequires: servlet Requires: bsf Requires: jpackage-utils >= 0:1.7.2 #BuildRequires: libreadline-java -Url: http://www.beanshell.org/ -Group: Development/Java -%if ! %{gcj_support} -Buildarch: noarch -%endif +URL: http://www.beanshell.org/ +Group: Development/Libraries +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description BeanShell is a small, free, embeddable, Java source interpreter with object scripting language features, written in Java. BeanShell executes @@ -85,21 +75,21 @@ scripts and return them as results. %package manual Summary: Manual for %{name} -Group: Development/Java +Group: Documentation %description manual Documentation for %{name}. %package javadoc Summary: Javadoc for %{name} -Group: Development/Java +Group: Documentation %description javadoc Javadoc for %{name}. %package demo Summary: Demo for %{name} -Group: Development/Java +Group: Development/Libraries AutoReqProv: no Requires: %{name} = %{epoch}:%{version}-%{release} Requires: /usr/bin/env @@ -108,8 +98,8 @@ Requires: /usr/bin/env Demonstrations and samples for %{name}. %package desktop -Summary: %{name} integration for the desktop -Group: Development/Java +Summary: Desktop integraton for %{name} +Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %description desktop @@ -277,12 +267,6 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF EOF cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc -%if %{gcj_support} -%{_bindir}/aot-compile-rpm \ - --exclude %{_datadir}/%{name}/webapps/bshservlet.war \ - --exclude %{_datadir}/%{name}/webapps/bshservlet-wbsh.war -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -294,13 +278,6 @@ fi %post %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif -exit 0 %postun desktop touch --no-create %{_datadir}/icons/hicolor @@ -310,13 +287,6 @@ fi %postun %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif -exit 0 %files %defattr(-,root,root) @@ -329,10 +299,6 @@ exit 0 %{_datadir}/maven2/poms/* %{_mavendepmapfragdir} -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif - %ifnarch ppc64 s390x %files manual %defattr(-,root,root) @@ -355,6 +321,10 @@ exit 0 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From bb423b33d873279045f657ae6625d35c252d98ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:17:22 +0000 Subject: [PATCH 09/93] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ccb6555..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: bsh -# $Id$ -NAME := bsh -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 39637ae86e6b84284d5bb897a44c125c0a795e69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:17:24 +0000 Subject: [PATCH 10/93] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ccb6555..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: bsh -# $Id$ -NAME := bsh -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From 536318dd8808e3631dbec225ebc9a91cc16592af Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 25 Nov 2010 14:50:10 +0100 Subject: [PATCH 11/93] Fix pom filenames (Resolves rhbz#655791) few more fixes to enable build of documentation (xsl patches) --- bsh-xsl-fixes.patch | 34 ++++++++++++++++++++++++++++++++++ bsh.spec | 23 ++++++++++++++--------- 2 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 bsh-xsl-fixes.patch diff --git a/bsh-xsl-fixes.patch b/bsh-xsl-fixes.patch new file mode 100644 index 0000000..f44ccbd --- /dev/null +++ b/bsh-xsl-fixes.patch @@ -0,0 +1,34 @@ +diff --git a/docs/faq/faq.xsl b/docs/faq/faq.xsl +index 44615de..341b435 100644 +--- a/docs/faq/faq.xsl ++++ b/docs/faq/faq.xsl +@@ -18,7 +18,7 @@ + + + +- ++ + + +- ++ + + -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - - - -- -+ - - -- -+ - -