rpms/bsh
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove arch-specific conditionals

Browse Source 
bsh is noarch package now so these conditionals are not used.
This commit is contained in:
Mikolaj Izdebski 2013-07-10 14:18:42 +02:00
parent a4916e4abf
commit 73e5869df7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bsh.spec
View File

@ -30,7 +30,7 @@
Name: bsh Name: bsh
Version: 1.3.0 Version: 1.3.0
Release: 25%{?dist} Release: 26%{?dist}
Epoch: 0 Epoch: 0
Summary: Lightweight Scripting for Java Summary: Lightweight Scripting for Java
License: (SPL or LGPLv2+) and Public Domain License: (SPL or LGPLv2+) and Public Domain
@ -135,10 +135,8 @@ ln -sf $(build-classpath servlet)
popd popd
ant="ant -Dant.build.javac.source=1.5" ant="ant -Dant.build.javac.source=1.5"
$ant test dist $ant test dist
%ifnarch ppc64 s390x
(cd docs/faq && $ant) (cd docs/faq && $ant)
(cd docs/manual && $ant) (cd docs/manual && $ant)
%endif
%install %install
# jars # jars
@ -175,11 +173,9 @@ find docs -name ".cvswrappers" -exec rm -f {} \;
find docs -name "*.xml" -exec rm -f {} \; find docs -name "*.xml" -exec rm -f {} \;
find docs -name "*.xsl" -exec rm -f {} \; find docs -name "*.xsl" -exec rm -f {} \;
find docs -name "*.log" -exec rm -f {} \; find docs -name "*.log" -exec rm -f {} \;
%ifnarch ppc64 s390x
(cd docs/manual && mv html/* .) (cd docs/manual && mv html/* .)
(cd docs/manual && rm -rf html) (cd docs/manual && rm -rf html)
(cd docs/manual && rm -rf xsl) (cd docs/manual && rm -rf xsl)
%endif
# javadoc # javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@ -301,10 +297,8 @@ fi
%{_datadir}/maven2/poms/* %{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/%{name} %{_mavendepmapfragdir}/%{name}
%ifnarch ppc64 s390x
%files manual %files manual
%doc docs/* %doc docs/*
%endif
%files javadoc %files javadoc
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}
@ -320,6 +314,9 @@ fi
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%changelog %changelog
* Wed Jul 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-26
- Remove arch-specific conditionals
* Thu Jun 06 2013 Michal Srb <msrb@redhat.com> - 0:1.3.0-25 * Thu Jun 06 2013 Michal Srb <msrb@redhat.com> - 0:1.3.0-25
- Enable tests - Enable tests
- Fix BR - Fix BR