- pass proper arch on amd64 - builds now

[packages/beecrypt.git] / beecrypt.spec

diff --git a/beecrypt.spec b/beecrypt.spec
index 59c0890159f13231e13752a8b8c7cc190a418f99..95cd0fe453abc8498a32e08407298786ba231f63 100644 (file)
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -5,6 +5,7 @@
 %bcond_without javaglue        # 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
 #
 Summary:       The BeeCrypt Cryptography Library
 Summary(pl):   Biblioteka kryptograficzna BeeCrypt
@@ -22,26 +23,34 @@ Patch2:             %{name}-ac_python.patch
 URL:           http://sourceforge.net/projects/beecrypt/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+%if %{with doc}
 BuildRequires: doxygen
+%endif
 %if %{with javaglue} && !%{with javac}
-BuildRequires: gcj
+BuildRequires: gcc-java
 %endif
+%if %{with doc}
 BuildRequires: ghostscript
 BuildRequires: graphviz
+%endif
 %if %{with javaglue} && %{with javac}
 BuildRequires: jdk
 %endif
 BuildRequires: libtool
+%if %{with javaglue} && !%{with javac}
 BuildRequires: libgcj-devel
+%endif
 %if %{with python}
 BuildRequires: python-devel
 BuildRequires: python-modules
 %endif
+%if %{with doc}
 BuildRequires: tetex-dvips
 BuildRequires: tetex-format-latex
 BuildRequires: tetex-latex-dstroke
 # note: this is incorrect place, it should be somewhere in tetex packages
 BuildRequires: tetex-metafont
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags_alpha          -mno-explicit-relocs 
@@ -168,7 +177,11 @@ Pythonie na u
        --without-cplusplus \
        --with%{!?with_javaglue:out}-javaglue \
        --with-cpu=%{_target_cpu} \
+%ifarch amd64
+       --with-arch=x86_64 \
+%else
        --with-arch=%{_target_cpu} \
+%endif
        --with-pic \
        --with%{!?with_python:out}-python
 %{__make}
@@ -177,7 +190,9 @@ Pythonie na u
 %{__make} -C python
 %endif
 
+%if %{with doc}
 doxygen
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -231,9 +246,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libbeecrypt_java.a
 %endif
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %doc docs/html/*
+%endif 
 
 %if %{with python}
 %files -n python-beecrypt