Hello community, here is the log from the commit of package bsh checked in at Wed Mar 5 21:17:24 CET 2008. -------- --- bsh/bsh.changes 2006-09-25 14:59:38.000000000 +0200 +++ bsh/bsh.changes 2008-03-05 14:07:12.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 5 14:06:59 CET 2008 - mvyskocil@suse.cz + +- merged with jpackage-1.7 + - added maven poms + - build with servletapi + +------------------------------------------------------------------- Old: ---- bsh-readline.patch New: ---- bsh-1.3.0.pom bsh-bsf-1.3.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh.spec ++++++ --- /var/tmp/diff_new_pack.V26987/_old 2008-03-05 21:14:02.000000000 +0100 +++ /var/tmp/diff_new_pack.V26987/_new 2008-03-05 21:14:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bsh (Version 1.3.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,8 +11,8 @@ # norootforbuild # icecream 0 + Name: bsh -BuildRequires: ant-trax bsf java2-devel-packages xml-commons-apis %define name bsh %define Name BeanShell %define version 1.3.0 @@ -20,19 +20,27 @@ %define release 6jpp %define section free Version: 1.3.0 -Release: 26 +Release: 223 Summary: Lightweight Scripting for Java -License: LGPL +License: LGPL v2.1 or later Source0: %{name}-%{fversion}-src.tar.bz2 +Source1: bsh-1.3.0.pom +Source2: bsh-bsf-1.3.0.pom Patch0: %{name}-build.patch -Patch1: %{name}-readline.patch Patch2: %{name}-java14compat.patch +BuildRequires: ant-trax +BuildRequires: bsf +BuildRequires: perl +BuildRequires: jpackage-utils >= 1.7.2 +BuildRequires: java-devel +BuildRequires: servletapi5 +BuildRequires: fdupes +PreReq: coreutils Requires: bsf -Requires: jpackage-utils >= 0:1.5 -#BuildRequires: libreadline-java -URL: http://www.beanshell.org/ +Requires: jpackage-utils >= 1.5 +Url: http://www.beanshell.org/ Group: Development/Libraries/Java -Buildarch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -86,7 +94,7 @@ Group: Development/Libraries/Java AutoReqProv: no Requires: %{name} = %{version} -Requires: /usr/bin/env +Requires: coreutils %description demo BeanShell is a small, free, embeddable, Java source interpreter with @@ -99,31 +107,47 @@ %prep %setup -q -n %{Name} %patch0 -p1 -#%patch1 -p1 %patch2 find . -name "*.jar" -exec rm -f {} \; # remove all CVS files for dir in `find . -type d -name CVS`; do rm -rf $dir; done for file in `find . -type f -name .cvsignore`; do rm -rf $file; done +# fix permissions +find . -type 'f' | xargs chmod 0644 %build mkdir -p lib -#export CLASSPATH=$(build-classpath bsf libreadline-java) -export CLASSPATH=$(build-classpath bsf) -# remove servlet dependency -rm -rf src/bsh/servlet -ant -Dexclude-servlet='bsh/servlet/*' compile -ant -Dexclude-servlet='bsh/servlet/*' jarall -ant -Dexclude-servlet='bsh/servlet/*' javadoc -ant -Dexclude-servlet='bsh/servlet/*' bshdoc +export CLASSPATH=$(build-classpath bsf servletapi5) +ant dist (cd docs/faq && ant) (cd docs/manual && ant) %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/%{name}-%{fversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +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 (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 %{name} %{name}-bsf %{version} JPP %{name}-bsf +# poms +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -pm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom +install -pm 644 %{SOURCE2} \ + $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsf.pom # manual find docs -name ".cvswrappers" -exec rm -f {} \; find docs -name "*.xml" -exec rm -f {} \; @@ -142,8 +166,24 @@ chmod 755 $i fi done +chmod 755 tests/Template +cat > one << EOF +#!/bin/sh +EOF +cat tests/Interactive/reload/one >> one +cat one > tests/Interactive/reload/one +rm one +cat > two << EOF +#!/bin/sh +EOF +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 # scripts install -d $RPM_BUILD_ROOT%{_bindir} cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF @@ -184,10 +224,26 @@ #!/usr/bin/env %{_bindir}/%{name} EOF cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc +%fdupes ${RPM_BUILD_ROOT}/usr %clean rm -rf $RPM_BUILD_ROOT +%post javadoc +rm -f %{_javadocdir}/%{name} +ln -s %{name}-%{version} %{_javadocdir}/%{name} + +%postun javadoc +if [ "$1" = "0" ]; then + rm -f %{_javadocdir}/%{name} +fi + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + %files %defattr(-,root,root) %doc src/Changes.html src/License.txt src/README.txt @@ -195,6 +251,13 @@ %attr(0755,root,root) %{_bindir}/%{name}doc %{_javadir}/* %dir %{_datadir}/%{name} +%{_datadir}/%{name} +%{_datadir}/%{name}/webapps +%{_datadir}/maven2 +%{_datadir}/maven2/poms +%{_datadir}/maven2/poms/* +%{_mavendepmapfragdir} +%exclude %{_datadir}/%{name}/tests %files manual %defattr(-,root,root) @@ -206,19 +269,24 @@ %files demo %defattr(-,root,root) -%{_datadir}/%{name}/* +%doc tests/README.txt tests/Interactive/README +%{_datadir}/%{name}/tests -%changelog -n bsh -* Mon Sep 25 2006 - skh@suse.de +%changelog +* Wed Mar 05 2008 mvyskocil@suse.cz +- merged with jpackage-1.7 + - added maven poms + - build with servletapi +* Mon Sep 25 2006 skh@suse.de - don't use icecream - use source="1.4" and target="1.4" for build with java 1.5 -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Jul 27 2005 - jsmeix@suse.de +* Wed Jul 27 2005 jsmeix@suse.de - Adjustments in the spec file. -* Wed Jul 20 2005 - jsmeix@suse.de +* Wed Jul 20 2005 jsmeix@suse.de - Current version 1.3.0 from JPackage.org -* Wed Sep 15 2004 - kukuk@suse.de +* Wed Sep 15 2004 kukuk@suse.de - Fix Requires of bsh-demo -* Mon Sep 06 2004 - skh@suse.de +* Mon Sep 06 2004 skh@suse.de - Initial package created with version 1.3.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org