From f94b14708a4ac11f914acb71d7fd4c79db144a1ba91226341e6605ce91309e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 16 Aug 2012 11:36:27 +0000
Subject: [PATCH] Accepting request 131010 from openSUSE:Factory:ARM

- don't fiddle with march settings, we want the distro defaults
  (fixes build on ARM)

OBS-URL: https://build.opensuse.org/request/show/131010
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=33
---
 Botan.changes            |  6 ++++++
 Botan.spec               | 10 ++++++++--
 dont-set-mach-value.diff | 13 +++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 dont-set-mach-value.diff

diff --git a/Botan.changes b/Botan.changes
index f2dc09a..897e2be 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 16 09:06:44 UTC 2012 - dmueller@suse.com
+
+- don't fiddle with march settings, we want the distro defaults
+  (fixes build on ARM)
+
 -------------------------------------------------------------------
 Tue Feb  7 08:04:05 UTC 2012 - coolo@suse.com
 
diff --git a/Botan.spec b/Botan.spec
index 8a80596..55d3a83 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define version_suffix 1_10-0
 %define short_version 1.10
 
@@ -33,8 +34,11 @@ Patch2:         Botan-fix_install_paths.patch
 Patch4:         Botan-no-buildtime.patch
 Patch5:         Botan-qt_thread_support.patch
 Patch6:         Botan-fix_pkgconfig.patch 
+Patch7:         dont-set-mach-value.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       zlib, bzip2 >= 1.0.2, gmp >= 4.1
+Requires:       bzip2 >= 1.0.2
+Requires:       gmp >= 4.1
+Requires:       zlib
 BuildRequires:  bzip2 >= 1.0.2
 BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel
@@ -65,7 +69,8 @@ supported, including RSA, DSA, DES, AES, MD5, and SHA-1.
 %package        -n libbotan-devel
 Summary:        Development files for Botan
 Group:          Development/Libraries/C and C++
-Requires:       gmp-devel libbz2-devel
+Requires:       gmp-devel
+Requires:       libbz2-devel
 Provides:       Botan-devel = %{version}
 Obsoletes:      Botan-devel < %{version}
 Requires:       libbotan-%{version_suffix} = %{version}
@@ -84,6 +89,7 @@ programs that use the Botan library.
 %patch4
 %patch5
 %patch6
+%patch7
 
 %build
 export RPM_OPT_FLAGS
diff --git a/dont-set-mach-value.diff b/dont-set-mach-value.diff
new file mode 100644
index 0000000..faf7353
--- /dev/null
+++ b/dont-set-mach-value.diff
@@ -0,0 +1,13 @@
+We don't want any fiddling with -march, our flags via %optflags are always right
+
+--- configure.py
++++ configure.py
+@@ -1081,7 +1081,7 @@
+                                      options.cpu, options.debug_build),
+ 
+         'lib_opt': cc.library_opt_flags(options),
+-        'mach_opt': cc.mach_opts(options.arch, options.cpu),
++        'mach_opt': '',
+         'check_opt': '' if options.no_optimizations else cc.check_opt_flags,
+         'lang_flags': cc.lang_flags + options.extra_flags,
+         'warn_flags': warning_flags(cc.warning_flags,