rpms/bsh/devel bsh.spec,1.20,1.21

[Permaine Cheung]

Author: pcheung

Update of /cvs/pkgs/rpms/bsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17743

Modified Files:
	bsh.spec 
Log Message:
Do not build manual and faq for ppc64 or s390x as the style task is disabled


Index: bsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bsh.spec	24 Jul 2009 18:27:06 -0000	1.20
+++ bsh.spec	21 Sep 2009 18:03:46 -0000	1.21
@@ -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 
 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 <pcheung at redhat.com> 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 <rel-eng at lists.fedoraproject.org> - 0:1.3.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild