Hello community, here is the log from the commit of package bsh for openSUSE:Factory checked in at 2015-04-02 16:00:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh (Old) and /work/SRC/openSUSE:Factory/.bsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh" Changes: -------- --- /work/SRC/openSUSE:Factory/bsh/bsh.changes 2013-09-11 13:39:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsh.new/bsh.changes 2015-04-02 16:00:43.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Mar 31 10:12:50 UTC 2015 - [email protected] + +- Fix bsh-demo dep on /bin/java + +------------------------------------------------------------------- +Wed Mar 18 09:46:04 UTC 2015 - [email protected] + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- +Tue Jul 8 10:41:30 UTC 2014 - [email protected] + +- Do not depend on ant-trax and run spec-cleaner. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh.spec ++++++ --- /var/tmp/diff_new_pack.gnnFaf/_old 2015-04-02 16:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.gnnFaf/_new 2015-04-02 16:00:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bsh # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,28 +14,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 -%define name bsh %define Name BeanShell -%define version 1.3.0 -%define fversion 1.3.0 -%define release 6jpp -%define section free - Name: bsh Version: 1.3.0 Release: 0 Summary: Lightweight Scripting for Java License: LGPL-2.1+ Group: Development/Libraries/Java -Source0: %{name}-%{fversion}-src.tar.bz2 +Url: http://www.beanshell.org/ +Source0: %{name}-%{version}-src.tar.bz2 Source1: bsh-1.3.0.pom Source2: bsh-bsf-1.3.0.pom Patch0: %{name}-build.patch Patch2: %{name}-java14compat.patch -BuildRequires: ant-trax +BuildRequires: ant BuildRequires: bsf BuildRequires: fdupes BuildRequires: java-devel @@ -43,12 +37,10 @@ BuildRequires: perl BuildRequires: servletapi5 BuildRequires: xalan-j2 -PreReq: coreutils Requires: bsf Requires: javapackages-tools -Url: http://www.beanshell.org/ -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description BeanShell is a small, free, embeddable Java source interpreter with @@ -69,8 +61,6 @@ references to "real live" objects into scripts and return them as results. - - %package manual Summary: Manual for bsh Group: Development/Libraries/Java @@ -81,10 +71,7 @@ This package contains the manual for BeanShell. - - %package javadoc -PreReq: coreutils Summary: Javadoc for bsh Group: Development/Libraries/Java @@ -94,12 +81,9 @@ This package contains the javadoc documentation for BeanShell. - - %package demo Summary: Demonstration and sample files for bsh Group: Development/Libraries/Java -AutoReqProv: no Requires: %{name} = %{version} Requires: coreutils @@ -109,8 +93,6 @@ This package contains sample and demonstration files for BeanShell. - - %prep %setup -q -n %{Name} %patch0 -p1 @@ -131,29 +113,29 @@ %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -d -m 755 %{buildroot}%{_javadir} install -m 644 dist/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar install -m 644 dist/%{name}-bsf-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-bsf-%{version}.jar + %{buildroot}%{_javadir}/%{name}-bsf-%{version}.jar install -m 644 dist/%{name}-classpath-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-classpath-%{version}.jar + %{buildroot}%{_javadir}/%{name}-classpath-%{version}.jar install -m 644 dist/%{name}-commands-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-commands-%{version}.jar + %{buildroot}%{_javadir}/%{name}-commands-%{version}.jar install -m 644 dist/%{name}-core-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar + %{buildroot}%{_javadir}/%{name}-core-%{version}.jar install -m 644 dist/%{name}-reflect-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-reflect-%{version}.jar + %{buildroot}%{_javadir}/%{name}-reflect-%{version}.jar install -m 644 dist/%{name}-util-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-util-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) + %{buildroot}%{_javadir}/%{name}-util-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) # poms -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom + %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -pm 644 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom + %{buildroot}%{_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 @@ -167,12 +149,12 @@ (cd docs/manual && rm -rf html) (cd docs/manual && rm -rf xsl) # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name} # 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 - if head -1 $i | grep '#!/usr/bin/env %{_bindir}/%{name}' >/dev/null; then +for i in `find tests -name \*.bsh` tests/Template; do + perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!%{_bindir}/env %{_bindir}/%{name},' $i + if head -1 $i | grep '#!%{_bindir}/env %{_bindir}/%{name}' >/dev/null; then chmod 755 $i fi done @@ -189,14 +171,14 @@ cat tests/Interactive/reload/two >> two cat two > tests/Interactive/reload/two rm two -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -pr tests $RPM_BUILD_ROOT%{_datadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/webapps -install -m 644 dist/bshservlet.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webapps -install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webapps +install -d -m 755 %{buildroot}%{_datadir}/%{name} +cp -pr tests %{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 $RPM_BUILD_ROOT%{_bindir} -cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF +install -d %{buildroot}%{_bindir} +cat > %{buildroot}%{_bindir}/%{name} << EOF #!/bin/sh # # %{name} script @@ -230,11 +212,11 @@ # Let's start run "\$@" EOF -cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF +cat > %{buildroot}%{_bindir}/%{name}doc << EOF #!/usr/bin/env %{_bindir}/%{name} EOF -cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc -%fdupes ${RPM_BUILD_ROOT}/usr +cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc +%fdupes %{buildroot}/usr %files %defattr(-,root,root) @@ -245,7 +227,7 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name} %{_datadir}/%{name}/webapps -%{_mavendepmapfragdir} +%{_datadir}/maven-metadata/%{name}.xml %{_mavenpomdir}/* %exclude %{_datadir}/%{name}/tests
