Hello community,
here is the log from the commit of package rhino for openSUSE:Factory checked
in at 2013-08-25 13:32:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rhino (Old)
and /work/SRC/openSUSE:Factory/.rhino.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rhino"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rhino/rhino.changes 2013-01-08
14:56:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rhino.new/rhino.changes 2013-08-25
13:32:35.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 23 11:17:16 UTC 2013 - mvysko...@suse.com
+
+- disable javadoc build
+- use add_maven_depmap from new javapackages-tools
+- workaround xbean.jar definition problem
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rhino.spec ++++++
--- /var/tmp/diff_new_pack.VoNzC0/_old 2013-08-25 13:32:36.000000000 +0200
+++ /var/tmp/diff_new_pack.VoNzC0/_new 2013-08-25 13:32:36.000000000 +0200
@@ -87,15 +87,6 @@
in Java. It is typically embedded into Java applications to provide
scripting to end users.
-%package javadoc
-Summary: JavaScript for Java
-Group: Development/Libraries/Java
-
-%description javadoc
-Rhino is an open-source implementation of JavaScript written entirely
-in Java. It is typically embedded into Java applications to provide
-scripting to end users.
-
%prep
# % setup -q -n %{name}%{cvs_version} -a 100
%setup -q -n %{name}%{cvs_version}
@@ -121,9 +112,9 @@
export CLASSPATH=$(build-classpath jline)
export OPT_JAR_LIST=:
%{ant} -v -d \
- -Dxbean.jar=$(build-classpath xmlbeans/xbean) \
+ -Dxbean.jar=$(build-classpath xmlbeans/xbean | cut -d ':' -f 1) \
-Djsr173.jar=$(build-classpath bea-stax-api) \
- deepclean jar copy-all javadoc
+ deepclean jar copy-all
pushd examples
export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath
xmlbeans/xbean 2>/dev/null)
@@ -138,10 +129,6 @@
cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}
ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar
-# javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -a javadoc/* %{buildroot}%{_javadocdir}/%{name}
-
# scripts
mkdir -p %{buildroot}%{_bindir}
install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
@@ -155,11 +142,12 @@
cp -a build/%{name}%{cvs_version}/%{name}-examples.jar
%{buildroot}%{_javadir}/%{name}-examples.jar
# poms
-mkdir -p %{buildroot}%{_datadir}/maven2/poms
-cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-js.pom
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-%add_to_maven_depmap %{name} js %{version} JPP js
+mkdir -p %{buildroot}%{_mavenpomdir}
+
+cp -a %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP-js.pom
+cp -a %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-js.pom js.jar
%clean
%{__rm} -rf %{buildroot}
@@ -172,15 +160,11 @@
%attr(0755,root,root) %{_bindir}/%{name}-idswitch
%attr(0755,root,root) %{_bindir}/%{name}-jsc
%{_javadir}/*.jar
-%{_datadir}/maven2
+%{_mavenpomdir}/*
%config %{_mavendepmapfragdir}
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}
-
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
