Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2013-09-03 22:01:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-25 14:53:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new/bsh2.changes 2013-09-03 22:01:58.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 28 13:22:44 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools +- unversioned javadoc dir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.MOXyI3/_old 2013-09-03 22:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.MOXyI3/_new 2013-09-03 22:01:59.000000000 +0200 @@ -19,9 +19,7 @@ %define orig_name bsh -%define Name BeanShell %define fversion 2.0b5 -%define section free Name: bsh2 Version: 2.0.0.b5 @@ -156,7 +154,7 @@ %prep -%setup -q -n %{Name}-%{fversion} +%setup -q -n BeanShell-%{fversion} %patch1 -p1 %patch2 -p0 %patch3 -p1 @@ -184,14 +182,14 @@ jar cf ../../lib/javaxscript.jar $(find . -name "*.class" -o -name "*.html") popd # set VERSION -%__perl -p -i -e 's|VERSION =.*;|VERSION = "%{version}-%{release}";|' src/bsh/Interpreter.java +perl -p -i -e 's|VERSION =.*;|VERSION = "%{version}-%{release}";|' src/bsh/Interpreter.java # 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 +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/*' -ant -Dasm.javadoc=%{_javadocdir}/asm \ +/usr/bin/ant -Dasm.javadoc=%{_javadocdir}/asm \ -Dbsf.javadoc=%{_javadocdir}/bsf \ -Djava.javadoc=%{_javadocdir}/java \ dist @@ -201,43 +199,45 @@ %install # jars -%__mkdir_p %{buildroot}%{_javadir}/%{name} +mkdir -p %{buildroot}%{_javadir}/%{name} #rap#%__rm -f dist/%{orig_name}-%{fversion}.jar -%__rm -f dist/%{orig_name}-%{fversion}-src.jar +rm -f dist/%{orig_name}-%{fversion}-src.jar for jar in dist/*.jar; do - %__install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{fversion}.jar`-%{version}.jar + 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) -%add_to_maven_depmap org.beanshell beanshell %{fversion} JPP/%{name} bsh -%add_to_maven_depmap org.beanshell bsh %{fversion} JPP/%{name} bsh -%add_to_maven_depmap org.beanshell bsh-classpath %{fversion} JPP/%{name} bsh-classpath -%add_to_maven_depmap org.beanshell bsh-commands %{fversion} JPP/%{name} bsh-commands -%add_to_maven_depmap org.beanshell bsh-core %{fversion} JPP/%{name} bsh-core -%add_to_maven_depmap org.beanshell bsh-reflect %{fversion} JPP/%{name} bsh-reflect -%add_to_maven_depmap org.beanshell bsh-util %{fversion} JPP/%{name} bsh-util -%add_to_maven_depmap org.beanshell bsh-bsf %{fversion} JPP/%{name} bsh-bsf -%add_to_maven_depmap org.beanshell bsh-classgen %{fversion} JPP/%{name} bsh-classgen -%add_to_maven_depmap org.beanshell bsh-engine %{fversion} JPP/%{name} bsh-engine + # poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh.pom install -m 644 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-classpath.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-classpath.pom install -m 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-commands.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-commands.pom install -m 644 %{SOURCE4} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-core.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-core.pom install -m 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-reflect.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-reflect.pom install -m 644 %{SOURCE6} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-util.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-util.pom install -m 644 %{SOURCE7} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-bsf.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-bsf.pom install -m 644 %{SOURCE8} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-classgen.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-classgen.pom install -m 644 %{SOURCE9} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bsh-engine.pom + %{buildroot}%{_mavenpomdir}/JPP.%{name}-bsh-engine.pom + +%add_maven_depmap JPP.%{name}-bsh.pom %{name}/bsh.jar -a org.beanshell:%{name} +%add_maven_depmap JPP.%{name}-bsh-classpath.pom %{name}/bsh-classpath.jar +%add_maven_depmap JPP.%{name}-bsh-commands.pom %{name}/bsh-commands.jar +%add_maven_depmap JPP.%{name}-bsh-core.pom %{name}/bsh-core.jar +%add_maven_depmap JPP.%{name}-bsh-reflect.pom %{name}/bsh-reflect.jar +%add_maven_depmap JPP.%{name}-bsh-util.pom %{name}/bsh-util.jar +%add_maven_depmap JPP.%{name}-bsh-bsf.pom %{name}/bsh-bsf.jar +%add_maven_depmap JPP.%{name}-bsh-classgen.pom %{name}/bsh-classgen.jar +%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 {} \; @@ -246,15 +246,17 @@ (cd docs/manual && %__mv -f html/* .) (cd docs/manual && %__rm -rf html) (cd docs/manual && %__rm -rf xsl) + # javadoc -%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} -%__cp -a javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{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 done -%__mkdir_p %{buildroot}%{_datadir}/%{name} + +mkdir -p %{buildroot}%{_datadir}/%{name} %__cp -a tests %{buildroot}%{_datadir}/%{name} find %{buildroot}%{_datadir}/%{name} -type d \ | sed 's|'%{buildroot}'|%dir |' > %{name}-demo-%{version}.files @@ -265,7 +267,7 @@ # bshservlet %__mkdir_p %{buildroot}%{_datadir}/%{name}/bshservlet (cd %{buildroot}%{_datadir}/%{name}/bshservlet -jar xf $RPM_BUILD_DIR/%{Name}-%{fversion}/dist/bshservlet.war +jar xf $RPM_BUILD_DIR/BeanShell-%{fversion}/dist/bshservlet.war ) # scripts %__mkdir_p %{buildroot}%{_bindir} @@ -315,16 +317,6 @@ %{__tar} --exclude classes --exclude dist --exclude api \ -cjf %{buildroot}%{_usrsrc}/%{name}-src/%{name}.tar.bz2 * -%clean -%__rm -rf %{buildroot} -%__rm -rf $RPM_BUILD_DIR/META-INF - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/%{name} @@ -340,7 +332,7 @@ %{_javadir}/%{name}/%{orig_name}-util*.jar %dir %{_datadir}/%{name} %{_datadir}/%{name}/bshservlet -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files bsf @@ -357,8 +349,7 @@ %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%dir %{_javadocdir}/%{name} %{_javadocdir}/%{name} %files demo -f %{name}-demo-%{version}.files -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
