- use x8664 macro

[packages/beecrypt.git] / beecrypt.spec

diff --git a/beecrypt.spec b/beecrypt.spec
index d82c57ccf96455d2fcc8f8f9d142cf2b95751306..60836c710043a384f36c3519c926dacb2d859aa1 100644 (file)
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -2,7 +2,7 @@
 # WARNING: despite unchanged SONAME, the RSA ABI (and API) has changed since 3.x!
 #
 # Conditional build:
-%bcond_without javaglue        # build with Java support
+%bcond_without java    # build with Java support
 %bcond_with    javac           # use javac instead of gcj
 %bcond_without python          # don't build python module
 %bcond_without doc             # don't build documentation
@@ -11,7 +11,7 @@ Summary:      The BeeCrypt Cryptography Library
 Summary(pl):   Biblioteka kryptograficzna BeeCrypt
 Name:          beecrypt
 Version:       4.1.2
-Release:       1
+Release:       2
 Epoch:         2
 License:       LGPL
 Group:         Libraries
@@ -26,24 +26,25 @@ BuildRequires:      automake
 %if %{with doc}
 BuildRequires: doxygen
 %endif
-%if %{with javaglue} && !%{with javac}
+%if %{with java} && !%{with javac}
 BuildRequires: gcc-java
 %endif
 %if %{with doc}
 BuildRequires: ghostscript
 BuildRequires: graphviz
 %endif
-%if %{with javaglue} && %{with javac}
+%if %{with java} && %{with javac}
 BuildRequires: jdk
 %endif
 BuildRequires: libtool
-%if %{with javaglue} && !%{with javac}
+%if %{with java} && !%{with javac}
 BuildRequires: libgcj-devel
 %endif
 %if %{with python}
 BuildRequires: python-devel
 BuildRequires: python-modules
 %endif
+BuildRequires: rpmbuild(macros) >= 1.213
 %if %{with doc}
 BuildRequires: tetex-dvips
 BuildRequires: tetex-format-latex
@@ -175,9 +176,13 @@ Pythonie na u
 %configure \
        %{?with_javac:ac_cv_have_gcj=no} \
        --without-cplusplus \
-       --with%{!?with_javaglue:out}-javaglue \
+       --with%{!?with_java:out}-javaglue \
        --with-cpu=%{_target_cpu} \
+%ifarch %{x8664}
+       --with-arch=x86_64 \
+%else
        --with-arch=%{_target_cpu} \
+%endif
        --with-pic \
        --with%{!?with_python:out}-python
 %{__make}
@@ -227,7 +232,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libbeecrypt.a
 
-%if %{with javaglue}
+%if %{with java}
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbeecrypt_java.so.*.*.*