Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at Fri Sep 24 01:04:16 CEST 2010. -------- --- bsh2/bsh2.changes 2009-11-25 09:52:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/bsh2/bsh2.changes 2010-08-09 13:32:58.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 9 09:40:21 UTC 2010 - mvyskocil@suse.cz + +- Add a new bsh2-src subpackage, which will be used for build of jedit + bnc#629375 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bsh2.fix-visit.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.bagzJB/_old 2010-09-24 01:03:58.000000000 +0200 +++ /var/tmp/diff_new_pack.bagzJB/_new 2010-09-24 01:03:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bsh2 (Version 2.0.0.b5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -25,9 +25,9 @@ Name: bsh2 Version: 2.0.0.b5 -Release: 1 +Release: 6 Summary: Lightweight Scripting for Java (BeanShell Version 2.x) -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Development/Libraries/Java Url: http://www.beanshell.org/ Source0: http://www.beanshell.org/bsh-2.0b5-src.tar.bz2 @@ -98,7 +98,7 @@ %package bsf -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (BSF support) Group: Development/Libraries/Java Requires: bsf @@ -109,7 +109,7 @@ %package classgen -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (ASM support) Group: Development/Libraries/Java Requires: asm @@ -120,7 +120,7 @@ %package manual -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (Manual) Group: Development/Libraries/Java @@ -130,7 +130,7 @@ %package javadoc -License: LGPL v2.1 or later +License: LGPLv2.1+ PreReq: coreutils Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (Java Documentation) Group: Development/Libraries/Java @@ -141,7 +141,7 @@ %package demo -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Lightweight Scripting for Java (BeanShell Version 2.x) (demo and samples) Group: Development/Libraries/Java AutoReqProv: no @@ -150,6 +150,13 @@ %description demo Demonstrations and samples for bsh2. +%package src +License: LGPLv2.1+ +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. %prep @@ -193,6 +200,7 @@ dist (cd docs/faq && %ant) (cd docs/manual && %ant) +%fdupes -s docs/ %install # jars @@ -304,6 +312,11 @@ %__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 * %clean %__rm -rf %{buildroot} @@ -354,4 +367,8 @@ %files demo -f %{name}-demo-%{version}.files %defattr(0644,root,root,0755) +%files src +%defattr(0644,root,root,0755) +%{_usrsrc}/%{name}-src + %changelog ++++++ bsh2-asm.patch ++++++ --- /var/tmp/diff_new_pack.bagzJB/_old 2010-09-24 01:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.bagzJB/_new 2010-09-24 01:03:59.000000000 +0200 @@ -1,6 +1,8 @@ ---- BeanShell/src/bsh/ClassGeneratorUtil.java~ 2004-01-23 15:27:23.000000000 -0500 -+++ BeanShell/src/bsh/ClassGeneratorUtil.java 2004-01-23 15:30:17.000000000 -0500 -@@ -297,7 +297,7 @@ +Index: BeanShell-2.0b5/src/bsh/ClassGeneratorUtil.java +=================================================================== +--- BeanShell-2.0b5.orig/src/bsh/ClassGeneratorUtil.java 2010-08-09 13:47:18.951873609 +0200 ++++ BeanShell-2.0b5/src/bsh/ClassGeneratorUtil.java 2010-08-09 13:47:21.344997553 +0200 +@@ -303,7 +303,7 @@ static void generateField( String fieldName, String type, int modifiers, ClassWriter cw ) { @@ -9,7 +11,7 @@ } /** -@@ -321,7 +321,7 @@ +@@ -327,7 +327,7 @@ // Generate method body CodeVisitor cv = cw.visitMethod( @@ -18,7 +20,7 @@ if ( (modifiers & ACC_ABSTRACT) != 0 ) return; -@@ -399,7 +399,7 @@ +@@ -405,7 +405,7 @@ // Create this constructor method CodeVisitor cv = @@ -27,7 +29,7 @@ // Generate code to push arguments as an object array generateParameterReifierCode( paramTypes, false/*isStatic*/, cv ); -@@ -601,7 +601,7 @@ +@@ -606,7 +606,7 @@ // Add method body CodeVisitor cv = cw.visitMethod( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org