[packages/icedtea7] Use the %{x8664} macro

jajcus jajcus at pld-linux.org
Mon Apr 22 11:18:15 CEST 2013


commit d0ced83257076757025abb749c99fa514d35e620
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Mon Apr 22 11:18:07 2013 +0200

    Use the %{x8664} macro

 icedtea7.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/icedtea7.spec b/icedtea7.spec
index eab954b..bf1a928 100644
--- a/icedtea7.spec
+++ b/icedtea7.spec
@@ -129,7 +129,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		jredir		%{_jvmdir}/%{jrereldir}
 %define		jvmjardir	%{_jvmjardir}/%{name}-%{version}
 
-%ifarch x86_64 amd64
+%ifarch %{x8664}
 %define		jre_arch	amd64
 %else
 %define		jre_arch	i386
@@ -687,8 +687,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/tnameserv.1*
 %{_mandir}/man1/unpack200.1*
 %lang(ja) %{_mandir}/ja/man1/java.1*
-%ifnarch x86_64
-%endif
 %lang(ja) %{_mandir}/ja/man1/keytool.1*
 %lang(ja) %{_mandir}/ja/man1/orbd.1*
 %lang(ja) %{_mandir}/ja/man1/pack200.1*
@@ -733,7 +731,7 @@ rm -rf $RPM_BUILD_ROOT
 %{jredir}/lib/cmm
 %{jredir}/lib/ext
 %dir %{jredir}/lib/%{jre_arch}
-%ifnarch x86_64
+%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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/d0ced83257076757025abb749c99fa514d35e620



More information about the pld-cvs-commit mailing list