From bd0eeaf59ab666658b46f3566e4337d0e030a11f Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Sep 21 2009 18:03:46 +0000 Subject: Do not build manual and faq for ppc64 or s390x as the style task is disabled --- diff --git a/bsh.spec b/bsh.spec index 3a5c0c2..12c9608 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,7 +32,7 @@ Name: bsh Version: 1.3.0 -Release: 15%{?dist} +Release: 15.1%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: SPL or LGPLv2+ @@ -136,9 +136,11 @@ pushd lib ln -sf $(build-classpath bsf) ln -sf $(build-classpath servlet) popd -ant dist -(cd docs/faq && ant) -(cd docs/manual && ant) +ant -Dant.build.javac.source=1.4 dist +%ifnarch ppc64 s390x +(cd docs/faq && ant -Dant.build.javac.source=1.4) +(cd docs/manual && ant -Dant.build.javac.source=1.4) +%endif %install rm -rf $RPM_BUILD_ROOT @@ -175,9 +177,11 @@ find docs -name ".cvswrappers" -exec rm -f {} \; find docs -name "*.xml" -exec rm -f {} \; find docs -name "*.xsl" -exec rm -f {} \; find docs -name "*.log" -exec rm -f {} \; +%ifnarch ppc64 s390x (cd docs/manual && mv html/* .) (cd docs/manual && rm -rf html) (cd docs/manual && rm -rf xsl) +%endif # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} @@ -329,9 +333,11 @@ exit 0 %attr(-,root,root) %{_libdir}/gcj/%{name} %endif +%ifnarch ppc64 s390x %files manual %defattr(-,root,root) %doc docs/* +%endif %files javadoc %defattr(-,root,root) @@ -349,6 +355,9 @@ exit 0 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Mon Sep 21 2009 Permaine Cheung 0:1.3.0-15.1 +- Do not build manual and faq for ppc64 or s390x as the style task is disabled + * Fri Jul 24 2009 Fedora Release Engineering - 0:1.3.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild