From c9659e6a9f666967fd63ab4938c1be225a3912d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 16:51:20 -0600 Subject: [PATCH 01/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 0a6287f..7c2ea88 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -328,6 +328,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 0d64ccd59ca5e36255830b4bdb268b4782148b73 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 13:18:23 -0500 Subject: [PATCH 02/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 7c2ea88..b01a291 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -328,6 +328,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 6e6470cc32496e6c0cd7a0dd8b17c41b934d6c50 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Nov 2012 16:24:16 +0100 Subject: [PATCH 03/77] Add additional maven depmap --- bsh.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index b01a291..3af489e 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -161,6 +161,7 @@ install -m 644 dist/%{name}-util-%{version}.jar \ (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) %add_to_maven_depmap %{name} %{name} %{version} JPP %{name} +%add_to_maven_depmap org.beanshell %{name} %{version} JPP %{name} %add_to_maven_depmap %{name} %{name}-bsf %{version} JPP %{name}-bsf # poms @@ -328,6 +329,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 86dcb637291228425fa2d04a24a7c3f3c9f8da0f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 20 Nov 2012 10:11:02 +0100 Subject: [PATCH 04/77] Resolves: rhbz#850008 bsh - Should not own /usr/share/maven-fragments directory --- bsh.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index 3af489e..82fc004 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -304,7 +304,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_datadir}/%{name} %{_datadir}/%{name}/webapps %{_datadir}/maven2/poms/* -%{_mavendepmapfragdir} +%{_mavendepmapfragdir}/%{name} %ifnarch ppc64 s390x %files manual @@ -329,6 +329,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Tue Nov 20 2012 David Tardon - 0:1.3.0-22 +- Resolves: rhbz#850008 bsh - Should not own /usr/share/maven-fragments + directory + * Thu Nov 1 2012 Mikolaj Izdebski - 0:1.3.0-21 - Add additional maven depmap From a0958a68902796f110c65dda888df36ff75710a0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 20 Nov 2012 10:36:16 +0100 Subject: [PATCH 05/77] Resolves: rhbz#878163 bsh - javadoc subpackage doesn't require jpackage-utils --- bsh.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bsh.spec b/bsh.spec index 82fc004..04e57f1 100644 --- a/bsh.spec +++ b/bsh.spec @@ -84,6 +84,7 @@ Documentation for %{name}. %package javadoc Summary: Javadoc for %{name} Group: Documentation +Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -332,6 +333,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * 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 * Thu Nov 1 2012 Mikolaj Izdebski - 0:1.3.0-21 - Add additional maven depmap From 8e7c857d52477cda521053b0f31a6ab54e41d1c3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 20 Nov 2012 10:40:28 +0100 Subject: [PATCH 06/77] Resolves: rhbz#878166 bsh: Public Domain not listed in license tag --- bsh.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 04e57f1..ce7be37 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Version: 1.3.0 Release: 22%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java -License: SPL or LGPLv2+ +License: (SPL or LGPLv2+) and Public Domain 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 @@ -335,6 +335,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : 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 From 369ec0c3cb6ad423a054e89e2397d8c19ccd722b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 12:03:46 -0600 Subject: [PATCH 07/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index ce7be37..c2f405e 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -330,6 +330,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 8f50f3371dcb2d96ad3380b8488cf11a2a1340e0 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 14 Feb 2013 02:21:26 -0500 Subject: [PATCH 08/77] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines --- bsh.spec | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/bsh.spec b/bsh.spec index c2f405e..9841349 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -53,7 +53,6 @@ Requires: jpackage-utils >= 0:1.7.5-3.9 URL: http://www.beanshell.org/ Group: Development/Libraries BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description BeanShell is a small, free, embeddable, Java source interpreter with @@ -142,7 +141,6 @@ $ant dist %endif %install -rm -rf $RPM_BUILD_ROOT # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -m 644 dist/%{name}-%{version}.jar \ @@ -187,7 +185,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # menu entry -desktop-file-install --vendor=fedora --mode=644 \ +desktop-file-install --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps convert src/bsh/util/lib/icon.gif \ @@ -277,29 +275,25 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF EOF cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc -%clean -rm -rf $RPM_BUILD_ROOT - %post utils -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %post %update_maven_depmap %postun utils if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %postun %update_maven_depmap %posttrans utils -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%defattr(-,root,root) %doc src/Changes.html src/License.txt src/README.txt %{_javadir}/* %dir %{_datadir}/%{name} @@ -309,27 +303,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %ifnarch ppc64 s390x %files manual -%defattr(-,root,root) %doc docs/* %endif %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo -%defattr(-,root,root) %doc tests/README.txt tests/Interactive/README %{_datadir}/%{name}/* %files utils -%defattr(-,root,root) %attr(0755,root,root) %{_bindir}/%{name}* -%{_datadir}/applications/*%{name}-desktop.desktop +%{_datadir}/applications/%{name}-desktop.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From a4916e4abf82e0991f010abf3f61142fa324f900 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 6 Jun 2013 09:22:33 +0200 Subject: [PATCH 09/77] Enable tests - Fix BR --- bsh.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bsh.spec b/bsh.spec index 9841349..c9a3e32 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -45,7 +45,7 @@ Source3: %{name}-desktop.desktop Patch0: %{name}-build.patch Patch1: %{name}-xsl-fixes.patch BuildRequires: java >= 1:1.6.0 -BuildRequires: ant, bsf, ant-trax, ImageMagick, desktop-file-utils +BuildRequires: ant, bsf, ImageMagick, desktop-file-utils BuildRequires: servlet Requires: java >= 1:1.6.0 Requires: bsf @@ -134,7 +134,7 @@ ln -sf $(build-classpath bsf) ln -sf $(build-classpath servlet) popd ant="ant -Dant.build.javac.source=1.5" -$ant dist +$ant test dist %ifnarch ppc64 s390x (cd docs/faq && $ant) (cd docs/manual && $ant) @@ -320,6 +320,10 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 73e5869df782e6e96a45d6330130d1dbcdeba8ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 14:18:42 +0200 Subject: [PATCH 10/77] Remove arch-specific conditionals bsh is noarch package now so these conditionals are not used. --- bsh.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bsh.spec b/bsh.spec index c9a3e32..29eb1e3 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -135,10 +135,8 @@ ln -sf $(build-classpath servlet) popd ant="ant -Dant.build.javac.source=1.5" $ant test dist -%ifnarch ppc64 s390x (cd docs/faq && $ant) (cd docs/manual && $ant) -%endif %install # jars @@ -175,11 +173,9 @@ 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} @@ -301,10 +297,8 @@ fi %{_datadir}/maven2/poms/* %{_mavendepmapfragdir}/%{name} -%ifnarch ppc64 s390x %files manual %doc docs/* -%endif %files javadoc %{_javadocdir}/%{name}-%{version} @@ -320,6 +314,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 +- Remove arch-specific conditionals + * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests - Fix BR From 94f38ecc56f5b82b33cd588a1747918cf78bbfa3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 14:20:24 +0200 Subject: [PATCH 11/77] Remove group tags --- bsh.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bsh.spec b/bsh.spec index 29eb1e3..87e36d5 100644 --- a/bsh.spec +++ b/bsh.spec @@ -51,7 +51,6 @@ Requires: java >= 1:1.6.0 Requires: bsf Requires: jpackage-utils >= 0:1.7.5-3.9 URL: http://www.beanshell.org/ -Group: Development/Libraries BuildArch: noarch %description @@ -75,14 +74,12 @@ scripts and return them as results. %package manual Summary: Manual for %{name} -Group: Documentation %description manual Documentation for %{name}. %package javadoc Summary: Javadoc for %{name} -Group: Documentation Requires: jpackage-utils %description javadoc @@ -90,7 +87,6 @@ Javadoc for %{name}. %package demo Summary: Demo for %{name} -Group: Development/Libraries AutoReqProv: no Requires: %{name} = %{epoch}:%{version}-%{release} Requires: /usr/bin/env @@ -100,7 +96,6 @@ Demonstrations and samples for %{name}. %package utils Summary: %{name} utilities -Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} Requires: jline Provides: %{name}-desktop = %{epoch}:%{version}-%{release} @@ -316,6 +311,7 @@ fi %changelog * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals +- Remove group tags * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests From 76a4031c0ba32d7c60dee331d2d00bfb39d06bb7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 14:21:13 +0200 Subject: [PATCH 12/77] Remove Requires on jpackage-utils --- bsh.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index 87e36d5..4da32d1 100644 --- a/bsh.spec +++ b/bsh.spec @@ -49,7 +49,6 @@ BuildRequires: ant, bsf, ImageMagick, desktop-file-utils BuildRequires: servlet Requires: java >= 1:1.6.0 Requires: bsf -Requires: jpackage-utils >= 0:1.7.5-3.9 URL: http://www.beanshell.org/ BuildArch: noarch @@ -80,7 +79,6 @@ Documentation for %{name}. %package javadoc Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -312,6 +310,7 @@ fi * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals - Remove group tags +- Remove Requires on jpackage-utils * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests From 642b0665b4aaea7e04b6f51740da794488b34986 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 14:24:01 +0200 Subject: [PATCH 13/77] Remove Requires on cureutils --- bsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 4da32d1..747790e 100644 --- a/bsh.spec +++ b/bsh.spec @@ -87,7 +87,6 @@ Javadoc for %{name}. Summary: Demo for %{name} AutoReqProv: no Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: /usr/bin/env %description demo Demonstrations and samples for %{name}. @@ -311,6 +310,7 @@ fi - Remove arch-specific conditionals - Remove group tags - Remove Requires on jpackage-utils +- Remove Requires on coreutils * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests From 7e3acd46fc7eef22a507ff75a382ade661ade5e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 15:24:42 +0200 Subject: [PATCH 14/77] Generate custom scripts with %jpackage_script --- bsh.spec | 50 +++----------------------------------------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/bsh.spec b/bsh.spec index 747790e..1d134a8 100644 --- a/bsh.spec +++ b/bsh.spec @@ -210,53 +210,8 @@ install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webap # scripts install -d $RPM_BUILD_ROOT%{_bindir} -function bsh_script() { - local jars=%{name}.jar runclass= - if [ $2 = jline.ConsoleRunner ] ; then - jars="$jars jline.jar" - runclass=bsh.Interpreter - fi -cat > $RPM_BUILD_ROOT%{_bindir}/$1 << EOF -#!/bin/sh -# -# $1 script -# JPackage Project (http://jpackage.sourceforge.net) - -# Source functions library -_prefer_jre=true -. %{_datadir}/java-utils/java-functions - -# Source system prefs -if [ -f %{_sysconfdir}/%{name}.conf ] ; then - . %{_sysconfdir}/%{name}.conf -fi - -# Source user prefs -if [ -f \$HOME/.%{name}rc ] ; then - . \$HOME/.%{name}rc -fi - -# Configuration -MAIN_CLASS=$2 -if [ -n "\$BSH_DEBUG" ]; then - BASE_FLAGS=-Ddebug=true -fi - -BASE_JARS="$jars" - -# Set parameters -set_jvm -set_classpath \$BASE_JARS -set_flags \$BASE_FLAGS -set_options \$BASE_OPTIONS - -# Let's start -run $runclass "\$@" -EOF -} - -bsh_script bsh jline.ConsoleRunner -bsh_script bsh-desktop bsh.Console +%jpackage_script jline.ConsoleRunner "\\${BSH_DEBUG:+-Ddebug=true}" bsh.Interpreter %{name}:jline %{name} true +%jpackage_script bsh.Console "\\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF #!/usr/bin/env %{_bindir}/%{name} @@ -311,6 +266,7 @@ fi - Remove group tags - Remove Requires on jpackage-utils - Remove Requires on coreutils +- Generate custom scripts with %%jpackage_script * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests From c3cf194a1e7f47e84be7014c6187f79d45ff8b8f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 15:26:59 +0200 Subject: [PATCH 15/77] Install versionless JARs only --- bsh.spec | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/bsh.spec b/bsh.spec index 1d134a8..b21d3b2 100644 --- a/bsh.spec +++ b/bsh.spec @@ -133,22 +133,11 @@ $ant test dist %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -install -m 644 dist/%{name}-bsf-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-bsf-%{version}.jar -install -m 644 dist/%{name}-classpath-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-classpath-%{version}.jar -install -m 644 dist/%{name}-commands-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-commands-%{version}.jar -install -m 644 dist/%{name}-core-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar -install -m 644 dist/%{name}-reflect-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-reflect-%{version}.jar -install -m 644 dist/%{name}-util-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-util-%{version}.jar +for mod in '' bsf classpath commands core reflect util; do + install -p -m 644 dist/%{name}${mod:+-${mod}}-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}${mod:+-${mod}}.jar +done -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) %add_to_maven_depmap %{name} %{name} %{version} JPP %{name} %add_to_maven_depmap org.beanshell %{name} %{version} JPP %{name} %add_to_maven_depmap %{name} %{name}-bsf %{version} JPP %{name}-bsf @@ -267,6 +256,7 @@ fi - Remove Requires on jpackage-utils - Remove Requires on coreutils - Generate custom scripts with %%jpackage_script +- Install versionless JARs only * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests From 354ec46f5bd293b1531f7ee7238d19608091c40d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Jul 2013 15:32:40 +0200 Subject: [PATCH 16/77] Install POM files to %{_mavenpomdir} --- bsh.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bsh.spec b/bsh.spec index b21d3b2..6daa492 100644 --- a/bsh.spec +++ b/bsh.spec @@ -143,11 +143,11 @@ done %add_to_maven_depmap %{name} %{name}-bsf %{version} JPP %{name}-bsf # poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom install -pm 644 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-bsf.pom + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom # manual find docs -name ".cvswrappers" -exec rm -f {} \; @@ -230,7 +230,7 @@ fi %{_javadir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/webapps -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/%{name} %files manual @@ -257,6 +257,7 @@ fi - 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 From dc1e371b2bcebd68e4bb6bf8b1be279960b8c3cf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 10:35:01 +0200 Subject: [PATCH 17/77] Use %add_maven_depmap instead of legacy macros --- bsh.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/bsh.spec b/bsh.spec index 6daa492..a6bfaf7 100644 --- a/bsh.spec +++ b/bsh.spec @@ -138,10 +138,6 @@ for mod in '' bsf classpath commands core reflect util; do $RPM_BUILD_ROOT%{_javadir}/%{name}${mod:+-${mod}}.jar done -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} -%add_to_maven_depmap org.beanshell %{name} %{version} JPP %{name} -%add_to_maven_depmap %{name} %{name}-bsf %{version} JPP %{name}-bsf - # poms install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 %{SOURCE1} \ @@ -149,6 +145,9 @@ install -pm 644 %{SOURCE1} \ install -pm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.beanshell:%{name} +%add_maven_depmap JPP-%{name}-bsf.pom %{name}-bsf.jar + # manual find docs -name ".cvswrappers" -exec rm -f {} \; find docs -name "*.xml" -exec rm -f {} \; @@ -210,18 +209,12 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc %post utils /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%post -%update_maven_depmap - %postun utils if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%postun -%update_maven_depmap - %posttrans utils /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -250,6 +243,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Fri Jul 12 2013 Mikolaj Izdebski - 0:1.3.0-26 +- Use %%add_maven_depmap instead of legacy macros + * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals - Remove group tags From bb284bdae792370bd8dc35c53e1c04bd45724f40 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 10:40:29 +0200 Subject: [PATCH 18/77] Install versionless javadocs --- bsh.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bsh.spec b/bsh.spec index a6bfaf7..0f83d06 100644 --- a/bsh.spec +++ b/bsh.spec @@ -157,9 +157,8 @@ find docs -name "*.log" -exec rm -f {} \; (cd docs/manual && rm -rf html) (cd docs/manual && rm -rf xsl) # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # menu entry desktop-file-install --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3} @@ -215,6 +214,12 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +# Workaround for RPM bug #646523 - can't change symlink to directory +# TODO: Remove this in F-22 +%pretrans javadoc -p +dir = "%{_javadocdir}/%{name}" +dummy = posix.readlink(dir) and os.remove(dir) + %posttrans utils /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -230,7 +235,6 @@ fi %doc docs/* %files javadoc -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo @@ -245,6 +249,7 @@ fi %changelog * Fri Jul 12 2013 Mikolaj Izdebski - 0:1.3.0-26 - Use %%add_maven_depmap instead of legacy macros +- Install versionless javadocs * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals From 3c9e3d710468cbd5bf9104be14899c1aad177896 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 10:42:26 +0200 Subject: [PATCH 19/77] Remove old Obsoletes --- bsh.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bsh.spec b/bsh.spec index 0f83d06..924ed81 100644 --- a/bsh.spec +++ b/bsh.spec @@ -96,10 +96,6 @@ Summary: %{name} utilities Requires: %{name} = %{epoch}:%{version}-%{release} Requires: jline Provides: %{name}-desktop = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-desktop < 0:1.3.0-17 -# So that yum will pull this in on base package upgrades from < 0:1.3.0-17 -# (bsh and bshdoc scripts moved here in -17): -Obsoletes: %{name} < 0:1.3.0-17 %description utils %{name} utilities. @@ -250,6 +246,7 @@ dummy = posix.readlink(dir) and os.remove(dir) * 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 * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals From ffbaceac7b9c0e75fcb88ab2f64cea601a855174 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 10:46:51 +0200 Subject: [PATCH 20/77] Update and format descriptions --- bsh.spec | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/bsh.spec b/bsh.spec index 924ed81..4a96add 100644 --- a/bsh.spec +++ b/bsh.spec @@ -54,22 +54,23 @@ BuildArch: noarch %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. +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} @@ -78,10 +79,10 @@ Summary: Manual for %{name} Documentation for %{name}. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +This package provides %{summary}. %package demo Summary: Demo for %{name} @@ -247,6 +248,7 @@ dummy = posix.readlink(dir) and os.remove(dir) - Use %%add_maven_depmap instead of legacy macros - Install versionless javadocs - Remove old Obsoletes +- Update and format descriptions * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals From 4d00d268f75519f3a538c08b0cee44c597796389 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 10:48:43 +0200 Subject: [PATCH 21/77] Install license file with manual and javadoc packages --- bsh.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 4a96add..ba6dada 100644 --- a/bsh.spec +++ b/bsh.spec @@ -221,7 +221,8 @@ dummy = posix.readlink(dir) and os.remove(dir) /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%doc src/Changes.html src/License.txt src/README.txt +%doc src/License.txt +%doc src/Changes.html src/README.txt %{_javadir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/webapps @@ -229,9 +230,11 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_mavendepmapfragdir}/%{name} %files manual +%doc src/License.txt %doc docs/* %files javadoc +%doc src/License.txt %{_javadocdir}/%{name} %files demo @@ -249,6 +252,7 @@ dummy = posix.readlink(dir) and os.remove(dir) - Install versionless javadocs - Remove old Obsoletes - Update and format descriptions +- Install license file with manual and javadoc packages * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals From e748cf7518a8edd8f2aa8e226834157aedee19d9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 10:50:43 +0200 Subject: [PATCH 22/77] Fix Requires and BuildRequires on java --- bsh.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index ba6dada..6a84c42 100644 --- a/bsh.spec +++ b/bsh.spec @@ -44,10 +44,10 @@ Source3: %{name}-desktop.desktop Patch0: %{name}-build.patch Patch1: %{name}-xsl-fixes.patch -BuildRequires: java >= 1:1.6.0 +BuildRequires: java-devel BuildRequires: ant, bsf, ImageMagick, desktop-file-utils BuildRequires: servlet -Requires: java >= 1:1.6.0 +Requires: java Requires: bsf URL: http://www.beanshell.org/ BuildArch: noarch @@ -253,6 +253,7 @@ dummy = posix.readlink(dir) and os.remove(dir) - Remove old Obsoletes - Update and format descriptions - Install license file with manual and javadoc packages +- Fix Requires and BuildRequires on java * Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 - Remove arch-specific conditionals From 3fdab4230bcc3a052040b03359ba3924811e4ea1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jul 2013 11:15:50 +0200 Subject: [PATCH 23/77] Fix calls to %jpackage_script --- bsh.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index 6a84c42..cf5c817 100644 --- a/bsh.spec +++ b/bsh.spec @@ -194,8 +194,8 @@ install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webap # scripts install -d $RPM_BUILD_ROOT%{_bindir} -%jpackage_script jline.ConsoleRunner "\\${BSH_DEBUG:+-Ddebug=true}" bsh.Interpreter %{name}:jline %{name} true -%jpackage_script bsh.Console "\\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true +%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline %{name} true +%jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF #!/usr/bin/env %{_bindir}/%{name} @@ -254,6 +254,7 @@ dummy = posix.readlink(dir) and os.remove(dir) - 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 From cb70e69005fc3d40eed8e2ffdf515d2d93163bbd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:00:12 -0500 Subject: [PATCH 24/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index cf5c817..569e3f3 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 26%{?dist} +Release: 27%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -247,6 +247,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From b4c0e319a47c0dd358d2c834a04a5eedb8a4eec6 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 30 Oct 2013 10:48:12 +0100 Subject: [PATCH 25/77] Switch to jline1 (Resolves rhbz#1023018) --- bsh.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bsh.spec b/bsh.spec index 569e3f3..56aae07 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 27%{?dist} +Release: 28%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -95,7 +95,7 @@ Demonstrations and samples for %{name}. %package utils Summary: %{name} utilities Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: jline +Requires: jline1 Provides: %{name}-desktop = %{epoch}:%{version}-%{release} %description utils @@ -194,7 +194,7 @@ install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webap # scripts install -d $RPM_BUILD_ROOT%{_bindir} -%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline %{name} true +%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline1/jline-1 %{name} true %jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF @@ -247,6 +247,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From e8ba75e31f892bc71b3c20b20373404c6877edc1 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:05:31 +0100 Subject: [PATCH 26/77] Use Requires: java-headless rebuild (#1067528) --- bsh.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bsh.spec b/bsh.spec index 56aae07..496aa49 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -47,7 +47,7 @@ Patch1: %{name}-xsl-fixes.patch BuildRequires: java-devel BuildRequires: ant, bsf, ImageMagick, desktop-file-utils BuildRequires: servlet -Requires: java +Requires: java-headless Requires: bsf URL: http://www.beanshell.org/ BuildArch: noarch @@ -247,6 +247,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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) From 2193e40c9dab54eb7399a6ce1f7bbd5b025c23e6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 May 2014 19:42:23 +0200 Subject: [PATCH 27/77] Use .mfiles generated during build --- bsh.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bsh.spec b/bsh.spec index 496aa49..0603bb6 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 29%{?dist} +Release: 30%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -220,14 +220,12 @@ dummy = posix.readlink(dir) and os.remove(dir) %posttrans utils /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files +%files -f .mfiles %doc src/License.txt %doc src/Changes.html src/README.txt %{_javadir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/webapps -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/%{name} %files manual %doc src/License.txt @@ -247,6 +245,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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) From 40a98cbfed3f27f2ab2c5207cd469574fc55eb44 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:36:38 -0500 Subject: [PATCH 28/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 0603bb6..d28d521 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 30%{?dist} +Release: 31%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -245,6 +245,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From f3e079fa77e69c30bd1480efc82860c5bdb2ee0f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Nov 2014 07:35:01 +0100 Subject: [PATCH 29/77] Remove workaround for RPM bug #646523 --- bsh.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bsh.spec b/bsh.spec index d28d521..36fff7c 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 31%{?dist} +Release: 32%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -211,12 +211,6 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -# Workaround for RPM bug #646523 - can't change symlink to directory -# TODO: Remove this in F-22 -%pretrans javadoc -p -dir = "%{_javadocdir}/%{name}" -dummy = posix.readlink(dir) and os.remove(dir) - %posttrans utils /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -245,6 +239,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 0b92dc387fc136ac8a4ed8601ed3e6290182a29f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:06:37 +0000 Subject: [PATCH 30/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 36fff7c..626050e 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 32%{?dist} +Release: 33%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -239,6 +239,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From a6fe1b5640dff300e496f0fa6be6635787d8e8dd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:14:58 +0000 Subject: [PATCH 31/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- bsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 626050e..3a162f1 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 33%{?dist} +Release: 34%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -239,6 +239,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 7fad1b4523dbe9e5702ab28913d5a0b81da4c6f3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 21 Jul 2016 14:52:08 +0200 Subject: [PATCH 32/77] Replace perl usage with sed --- bsh.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/bsh.spec b/bsh.spec index 3a162f1..786d51a 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 34%{?dist} +Release: 35%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -45,7 +45,10 @@ Source3: %{name}-desktop.desktop Patch0: %{name}-build.patch Patch1: %{name}-xsl-fixes.patch BuildRequires: java-devel -BuildRequires: ant, bsf, ImageMagick, desktop-file-utils +BuildRequires: ant +BuildRequires: bsf +BuildRequires: ImageMagick +BuildRequires: desktop-file-utils BuildRequires: servlet Requires: java-headless Requires: bsf @@ -54,20 +57,20 @@ BuildArch: noarch %description BeanShell is a small, free, embeddable, Java source interpreter with -object scripting language features, written in Java. BeanShell +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 +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 +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 +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 +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 +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. @@ -165,7 +168,7 @@ convert src/bsh/util/lib/icon.gif \ # demo for i in `find tests -name \*.bsh`; do - perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i + sed -ri '1s,^#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i if head -1 $i | grep '#!/usr/bin/env %{_bindir}/%{name}' >/dev/null; then chmod 755 $i fi @@ -239,6 +242,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 From 746caad2229a2d2740fadfc6b3f925c9dcd699d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 13 Oct 2016 00:47:10 +0300 Subject: [PATCH 33/77] Switch to jline 2.x in -utils, mark License.txt as %license https://bugzilla.redhat.com/show_bug.cgi?id=1384236 Signed-off-by: Mikolaj Izdebski --- bsh.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bsh.spec b/bsh.spec index 786d51a..a1d6580 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 35%{?dist} +Release: 36%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -98,7 +98,7 @@ Demonstrations and samples for %{name}. %package utils Summary: %{name} utilities Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: jline1 +Requires: jline Provides: %{name}-desktop = %{epoch}:%{version}-%{release} %description utils @@ -197,7 +197,7 @@ install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webap # scripts install -d $RPM_BUILD_ROOT%{_bindir} -%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline1/jline-1 %{name} true +%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline %{name} true %jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF @@ -218,18 +218,18 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f .mfiles -%doc src/License.txt +%license src/License.txt %doc src/Changes.html src/README.txt %{_javadir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/webapps %files manual -%doc src/License.txt +%license src/License.txt %doc docs/* %files javadoc -%doc src/License.txt +%license src/License.txt %{_javadocdir}/%{name} %files demo @@ -242,6 +242,10 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* 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 @@ -408,7 +412,7 @@ fi - remove bsf patch (fixed upstream) - add epoch to demo package Requires -* Fri Apr 12 2003 David Walluck 0:1.2-0.b8.4jpp +* 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 From 9a27cb9c42bea47dc8401212aeeaadeca995c72a Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 23 Nov 2016 17:49:36 +0100 Subject: [PATCH 34/77] Update to upstream version 2.0.b6 --- .gitignore | 1 + bsh-1.3.0.pom | 8 -- bsh-bsf-1.3.0.pom | 8 -- bsh-build.patch | 54 ------------ bsh-xsl-fixes.patch | 34 ------- bsh.spec | 209 +++++++++++++++----------------------------- sources | 2 +- 7 files changed, 73 insertions(+), 243 deletions(-) delete mode 100644 bsh-1.3.0.pom delete mode 100644 bsh-bsf-1.3.0.pom delete mode 100644 bsh-build.patch delete mode 100644 bsh-xsl-fixes.patch diff --git a/.gitignore b/.gitignore index 3128130..112da74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bsh-1.3.0-src.tar.bz2 +/2.0b6.tar.gz diff --git a/bsh-1.3.0.pom b/bsh-1.3.0.pom deleted file mode 100644 index 2fdc81a..0000000 --- a/bsh-1.3.0.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - bsh - bsh - Beanshell - 1.3.0 - diff --git a/bsh-bsf-1.3.0.pom b/bsh-bsf-1.3.0.pom deleted file mode 100644 index ba753f0..0000000 --- a/bsh-bsf-1.3.0.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - bsh - bsh-bsf - Beanshell BSFEngine - 1.3.0 - diff --git a/bsh-build.patch b/bsh-build.patch deleted file mode 100644 index 31a2332..0000000 --- a/bsh-build.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- BeanShell/build.xml.orig 2004-01-20 19:12:20.888557245 -0500 -+++ BeanShell/build.xml 2004-01-20 19:13:36.150184282 -0500 -@@ -103,50 +103,7 @@ - value="docs/manual/bshcommands-bshdoc.xml"/> - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - - - -- -+ - - -- -+ - -