Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2014-07-16 16:49:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2014-05-27 11:51:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new/bsh2.changes 2014-07-16 16:49:29.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jul 8 08:41:24 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner. +- Fix few rpmlint complaints +- Kill src package as nothing seem to depend on it and it is pointless. + +------------------------------------------------------------------- +Tue Jul 8 08:34:26 UTC 2014 - [email protected] + +- Change the bytecode stuff. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.w910jM/_old 2014-07-16 16:49:30.000000000 +0200 +++ /var/tmp/diff_new_pack.w910jM/_new 2014-07-16 16:49:30.000000000 +0200 @@ -3,7 +3,6 @@ # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +19,6 @@ %define orig_name bsh %define fversion 2.0b5 - Name: bsh2 Version: 2.0.0.b5 Release: 0 @@ -28,7 +26,7 @@ License: SPL-1.0 or LGPL-2.0+ Group: Development/Libraries/Java Url: http://www.beanshell.org/ -Source0: http://www.beanshell.org/bsh-2.0b5-src.tar.bz2 +Source0: http://www.beanshell.org/%{orig_name}-%{fversion}-src.tar.bz2 Source1: beanshell-2.0b5.pom Source2: bsh-classpath-2.0b5.pom Source3: bsh-commands-2.0b5.pom @@ -45,29 +43,21 @@ #PATCH-FIX-OPENSUSE: those two patches fixes a compatibility with a standard javax.script API Patch1000: bsh2-fix-tests.patch Patch1001: bsh2-standard-script-api.patch -Requires(post): javapackages-tools -Requires(postun): javapackages-tools -Requires: bsf -Requires: javapackages-tools -Requires: objectweb-asm BuildRequires: ant BuildRequires: asm >= 1.5.3 +BuildRequires: asm-javadoc BuildRequires: bsf +BuildRequires: bsf-javadoc +BuildRequires: fdupes BuildRequires: java-devel >= 1.6.0 BuildRequires: javacc3 -#BuildRequires: servlet_2_3_api -BuildRequires: ant-trax -BuildRequires: asm-javadoc -BuildRequires: bsf-javadoc BuildRequires: javapackages-tools BuildRequires: servletapi4 -#BuildRequires: xalan-j2 -BuildRequires: fdupes -BuildArch: noarch +Requires: bsf +Requires: javapackages-tools +Requires: objectweb-asm BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} == 1110 -BuildRequires: -post-build-checks -%endif +BuildArch: noarch %description BeanShell is a small, free, embeddable, Java source interpreter with @@ -98,68 +88,49 @@ loose, unstructured BeanShell scripts, method closures, and full scripted classes. - - %package bsf -Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (BSF support) +Summary: BSF support for bsh2 Group: Development/Libraries/Java Requires: bsf %description bsf -BSF support for bsh2. - - +Lightweight Scripting for Java (BeanShell Version 2.x) (BSF support). %package classgen -Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (ASM support) +Summary: ASM support for bsh2 Group: Development/Libraries/Java Requires: asm %description classgen -ASM support for bsh2. - - +Lightweight Scripting for Java (BeanShell Version 2.x) (ASM support). %package manual -Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (Manual) +Summary: Documentation for bsh2 Group: Development/Libraries/Java %description manual -Documentation for bsh2. - - +Lightweight Scripting for Java (BeanShell Version 2.x) (Manual). %package javadoc -PreReq: coreutils -Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (Java Documentation) +Summary: Javadoc for bsh2 Group: Development/Libraries/Java %description javadoc -Javadoc for bsh2. - - +Lightweight Scripting for Java (BeanShell Version 2.x) (Java Documentation). %package demo -Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (demo and samples) -Group: Development/Libraries/Java AutoReqProv: no +Summary: Demonstrations and samples for bsh2 +Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} %description demo -Demonstrations and samples for bsh2. - -%package src -Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (demo and samples) -Group: Development/Libraries/Java - -%description src -Source code of beanshell used for build of jEdit. - +Lightweight Scripting for Java (BeanShell Version 2.x) (demo and samples). %prep %setup -q -n BeanShell-%{fversion} %patch1 -p1 -%patch2 -p0 +%patch2 %patch3 -p1 %patch1000 -p1 %patch1001 -p1 @@ -189,22 +160,17 @@ # remove internal asm code, use JPackage external jar instead rm -rf src/bsh/org perl -p -i -e 's|bsh.org.objectweb.asm|org.objectweb.asm|' src/bsh/ClassGeneratorUtil.java -# remove servlet dependency -#%__rm -rf src/bsh/servlet -#ant -Dexclude-servlet='bsh/servlet/*' -/usr/bin/ant -Dasm.javadoc=%{_javadocdir}/asm \ +ant \ + -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dasm.javadoc=%{_javadocdir}/asm \ -Dbsf.javadoc=%{_javadocdir}/bsf \ -Djava.javadoc=%{_javadocdir}/java \ dist -(cd docs/faq && %ant) -(cd docs/manual && %ant) +(cd docs/faq && ant) +(cd docs/manual && ant) %fdupes -s docs/ %install -%if 0%{?suse_version} == 1110 -export NO_BRP_CHECK_BYTECODE_VERSION=true -%endif - # jars mkdir -p %{buildroot}%{_javadir}/%{name} #rap#%__rm -f dist/%{orig_name}-%{fversion}.jar @@ -212,7 +178,7 @@ for jar in dist/*.jar; do install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{fversion}.jar`-%{version}.jar done -(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do %__ln_s ${jar} ${jar/-%{version}/}; done) +(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done) # poms install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -246,25 +212,25 @@ %add_maven_depmap JPP.%{name}-bsh-engine.pom %{name}/bsh-engine.jar # manual -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 {} \; -(cd docs/manual && %__mv -f html/* .) -(cd docs/manual && %__rm -rf html) -(cd docs/manual && %__rm -rf xsl) +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 {} \; +(cd docs/manual && mv -f html/* .) +(cd docs/manual && rm -rf html) +(cd docs/manual && rm -rf xsl) # javadoc -%__mkdir_p %{buildroot}%{_javadocdir}/%{name} -%__cp -a javadoc/* %{buildroot}%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -a 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),#!%{_bindir}/%{name},' $i + perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!%{_bindir}/%{name},' $i done mkdir -p %{buildroot}%{_datadir}/%{name} -%__cp -a tests %{buildroot}%{_datadir}/%{name} +cp -a tests %{buildroot}%{_datadir}/%{name} find %{buildroot}%{_datadir}/%{name} -type d \ | sed 's|'%{buildroot}'|%dir |' > %{name}-demo-%{version}.files find %{buildroot}%{_datadir}/%{name} -type f -name "*.bsh" \ @@ -272,13 +238,13 @@ find %{buildroot}%{_datadir}/%{name} -type f ! -name "*.bsh" \ | sed 's|'%{buildroot}'|%attr(0644,root,root) |' >> %{name}-demo-%{version}.files # bshservlet -%__mkdir_p %{buildroot}%{_datadir}/%{name}/bshservlet +mkdir -p %{buildroot}%{_datadir}/%{name}/bshservlet (cd %{buildroot}%{_datadir}/%{name}/bshservlet jar xf $RPM_BUILD_DIR/BeanShell-%{fversion}/dist/bshservlet.war ) # scripts -%__mkdir_p %{buildroot}%{_bindir} -%__cat > %{buildroot}%{_bindir}/%{name} << EOF +mkdir -p %{buildroot}%{_bindir} +cat > %{buildroot}%{_bindir}/%{name} << EOF #!/bin/sh # # %{name} script @@ -312,17 +278,12 @@ # Let's start run "\$@" EOF -%__cat > %{buildroot}%{_bindir}/%{name}doc << EOF +cat > %{buildroot}%{_bindir}/%{name}doc << EOF #!/usr/bin/env %{_bindir}/%{name} EOF -%__cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc +cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/%{name}doc %fdupes -s %{buildroot} %fdupes docs/ -# src -# bsh2-src - copy from debian/rules -%{__install} -d -m 0755 %{buildroot}%{_usrsrc}/%{name}-src -%{__tar} --exclude classes --exclude dist --exclude api \ - -cjf %{buildroot}%{_usrsrc}/%{name}-src/%{name}.tar.bz2 * %files %defattr(0644,root,root,0755) @@ -363,8 +324,4 @@ %files demo -f %{name}-demo-%{version}.files %defattr(0644,root,root,0755) -%files src -%defattr(0644,root,root,0755) -%{_usrsrc}/%{name}-src - %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
