- disable javadoc build

- use add_maven_depmap from new javapackages-tools
- workaround xbean.jar definition problem

OBS-URL: https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=20
This commit is contained in:
Michal Vyskocil 2013-08-23 11:35:00 +00:00 committed by Git OBS Bridge
parent cda5c4353c
commit abd45905d1
2 changed files with 16 additions and 25 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 23 11:17:16 UTC 2013 - mvyskocil@suse.com
- disable javadoc build
- use add_maven_depmap from new javapackages-tools
- workaround xbean.jar definition problem
-------------------------------------------------------------------
Mon Jan 7 12:18:22 UTC 2013 - mvyskocil@suse.com

View File

@ -87,15 +87,6 @@ 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.
%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 @@ sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date
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 @@ mkdir -p %{buildroot}%{_javadir}
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 examples/* %{buildroot}%{_datadir}/%{name}
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 @@ cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%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