diff --git a/rhino.changes b/rhino.changes index e826af1..a141eaa 100644 --- a/rhino.changes +++ b/rhino.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 13 09:42:42 CET 2008 - mvyskocil@suse.cz + +- fixed bnc#444259 - rhino contains conflicting class in rhino-examples.jar + - don't build and install a rhino-examples.jar + ------------------------------------------------------------------- Thu Oct 16 09:01:30 CEST 2008 - mvyskocil@suse.cz diff --git a/rhino.spec b/rhino.spec index 76178f7..3aa0a7c 100644 --- a/rhino.spec +++ b/rhino.spec @@ -23,7 +23,7 @@ Name: rhino Version: 1.7 -Release: 5 +Release: 6 Summary: JavaScript for Java License: MOZILLA PUBLIC LICENSE (MPL/NPL) Source0: ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{archive_version}.tar.bz2 @@ -120,17 +120,21 @@ ant \ -Djsr173.jar=$(build-classpath bea-stax-api) \ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ deepclean jar copy-all javadoc +%if 0 pushd examples export CLASSPATH=../build/%{name}%{archive_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null) javac -C *.java jar cvf ../build/%{name}%{archive_version}/%{name}-examples-%{version}.jar *.class popd +%endif %install # jars %{__mkdir_p} %{buildroot}%{_javadir} %{__cp} -a build/%{name}%{archive_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +%if 0 %{__cp} -a build/%{name}%{archive_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar +%endif (cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar js-%{version}.jar) (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done) # poms @@ -182,6 +186,9 @@ popd %{_javadocdir}/%{name} %changelog +* Thu Nov 13 2008 mvyskocil@suse.cz +- fixed bnc#444259 - rhino contains conflicting class in rhino-examples.jar + - don't build and install a rhino-examples.jar * Thu Oct 16 2008 mvyskocil@suse.cz - Use xerces-j2-bootstrap to prevent another build cycle - Added a xerces-j2 and non-bootstrap xml-commons* packages to BuildIgnore