[packages/icedtea7] Fix shark disabling
jajcus
jajcus at pld-linux.org
Fri Jul 18 22:43:23 CEST 2014
commit a614332684bed14d2cf25bcde0ad3875fbd2b2f7
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Fri Jul 18 22:35:49 2014 +0200
Fix shark disabling
- include files that wern't disabled with shark
- llvm is not needed anymore
icedtea7.spec | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/icedtea7.spec b/icedtea7.spec
index eda9ccb..a8d9728 100644
--- a/icedtea7.spec
+++ b/icedtea7.spec
@@ -70,9 +70,6 @@ BuildRequires: libgcj
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-static
-%ifarch i486
-BuildRequires: llvm-devel
-%endif
BuildRequires: lsb-release
%{?with_nss:BuildRequires: nss-devel}
BuildRequires: pkgconfig
@@ -659,9 +656,7 @@ rm -rf $RPM_BUILD_ROOT
%{dstdir}/lib/jconsole.jar
%attr(755,root,root) %{dstdir}/lib/jexec
%{dstdir}/lib/orb.idl
-%ifnarch i486
%{dstdir}/lib/sa-jdi.jar
-%endif
%{dstdir}/lib/tools.jar
%dir %{dstdir}/lib/%{jre_arch}
%dir %{dstdir}/lib/%{jre_arch}/jli
@@ -733,7 +728,7 @@ rm -rf $RPM_BUILD_ROOT
%{jredir}/lib/cmm
%{jredir}/lib/ext
%dir %{jredir}/lib/%{jre_arch}
-%ifnarch %{x8664} i486
+%ifnarch %{x8664}
%dir %{jredir}/lib/%{jre_arch}/client
%{jredir}/lib/%{jre_arch}/client/Xusage.txt
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/client/*.so
@@ -744,9 +739,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/jli/*.so
%dir %{jredir}/lib/%{jre_arch}/server
%{jredir}/lib/%{jre_arch}/server/Xusage.txt
-%ifnarch i486
%{jredir}/lib/%{jre_arch}/server/classes.jsa
-%endif
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/server/*.so
%{jredir}/lib/%{jre_arch}/jvm.cfg
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libattach.so
@@ -774,9 +767,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnet.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnio.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnpt.so
-%ifnarch i486
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsaproc.so
-%endif
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsctp.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libunpack.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libverify.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/b764741b966da6924c41ea64b7b9f08b948aee9a
More information about the pld-cvs-commit
mailing list