diff --git a/bsh.spec b/bsh.spec index c9a3e32..29eb1e3 100644 --- a/bsh.spec +++ b/bsh.spec @@ -30,7 +30,7 @@ Name: bsh Version: 1.3.0 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: (SPL or LGPLv2+) and Public Domain @@ -135,10 +135,8 @@ ln -sf $(build-classpath servlet) popd ant="ant -Dant.build.javac.source=1.5" $ant test dist -%ifnarch ppc64 s390x (cd docs/faq && $ant) (cd docs/manual && $ant) -%endif %install # jars @@ -175,11 +173,9 @@ 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} @@ -301,10 +297,8 @@ fi %{_datadir}/maven2/poms/* %{_mavendepmapfragdir}/%{name} -%ifnarch ppc64 s390x %files manual %doc docs/* -%endif %files javadoc %{_javadocdir}/%{name}-%{version} @@ -320,6 +314,9 @@ fi %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog +* Wed Jul 10 2013 Mikolaj Izdebski - 0:1.3.0-26 +- Remove arch-specific conditionals + * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests - Fix BR