From cf3e0b143cfe3243774db410c29b1415d0fead40624f56afcaa474325d401472 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Tue, 31 Aug 2010 12:17:29 +0000
Subject: [PATCH] Accepting request 46811 from
 home:a_jaeger:branches:build-compare-test

Copy from home:a_jaeger:branches:build-compare-test/Botan via accept of submit request 46811 revision 4.
Request was accepted with message:
OK

OBS-URL: https://build.opensuse.org/request/show/46811
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=15
---
 Botan.changes                         | 12 ++++++++++++
 Botan.spec                            |  7 ++++++-
 botan-1.8.8-binutils_lea_offset.patch | 28 +++++++++++++++++++++++++++
 no-buildtime.patch                    | 22 +++++++++++++++++++++
 ready                                 |  0
 5 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 botan-1.8.8-binutils_lea_offset.patch
 create mode 100644 no-buildtime.patch
 delete mode 100644 ready

diff --git a/Botan.changes b/Botan.changes
index 7bef5d5..b618a28 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 31 09:22:59 UTC 2010 - aj@suse.de
+
+- Do not include build time and host in package to not trigger rebuilds.
+- Add pkg-config build requires as suggested by rpmlint.
+
+-------------------------------------------------------------------
+Wed Mar 10 01:01:48 CET 2010 - ro@suse.de
+
+- add patch from fedora to fix build on x86_64
+  (botan-1.8.8-binutils_lea_offset.patch)
+
 -------------------------------------------------------------------
 Sun Jan 10 04:27:38 CET 2010 - jengelh@medozas.de
 
diff --git a/Botan.spec b/Botan.spec
index 2f0387c..441462a 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -21,7 +21,7 @@
 
 Name:           Botan
 Version:        1.8.8
-Release:        4
+Release:        5
 Url:            http://botan.randombit.net
 Summary:        A C++ Crypto Library
 License:        BSD3c
@@ -32,10 +32,13 @@ Source:         %{name}-%{version}.tar.bz2
 Patch0:         Botan-inttypes.patch
 Patch1:         Botan-ull_constants.patch.bz2
 Patch2:         Botan-fix_install_paths.patch
+Patch3:         botan-1.8.8-binutils_lea_offset.patch
+Patch4:		no-buildtime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       zlib, bzip2 >= 1.0.2, gmp >= 4.1
 BuildRequires:  bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel
 BuildRequires:  gcc-c++ gmp-devel libbz2-devel openssl-devel python
+BuildRequires:  pkg-config
 
 %description
 Botan is a C++ library that provides support for many common
@@ -92,6 +95,8 @@ Authors:
 %patch0
 %patch1
 %patch2
+%patch3
+%patch4
 
 %build
 export RPM_OPT_FLAGS
diff --git a/botan-1.8.8-binutils_lea_offset.patch b/botan-1.8.8-binutils_lea_offset.patch
new file mode 100644
index 0000000..378371f
--- /dev/null
+++ b/botan-1.8.8-binutils_lea_offset.patch
@@ -0,0 +1,28 @@
+#
+#
+# patch "src/hash/sha1_amd64/sha1_amd64_imp.S"
+#  from [dd263db10309950dec501dd9257a8df43cf6c6aa]
+#    to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962]
+#
+================================================================================
+--- src/hash/sha1_amd64/sha1_amd64_imp.S
++++ src/hash/sha1_amd64/sha1_amd64_imp.S
+@@ -103,10 +103,16 @@
+ 
+    subq $320, W
+ 
++/*
++* Using negative values for SHA-1 constants > 2^31 to work around
++* a bug in binutils not accepting large lea displacements.
++*   -0x70E44324 == 0x8F1BBCDC
++*   -0x359D3E2A == 0xCA62C1D6
++*/
+ #define MAGIC1 0x5A827999
+ #define MAGIC2 0x6ED9EBA1
+-#define MAGIC3 0x8F1BBCDC
+-#define MAGIC4 0xCA62C1D6
++#define MAGIC3 -0x70E44324
++#define MAGIC4 -0x359D3E2A
+ 
+ #define T %esi
+ #define T2 %eax
diff --git a/no-buildtime.patch b/no-buildtime.patch
new file mode 100644
index 0000000..a462f54
--- /dev/null
+++ b/no-buildtime.patch
@@ -0,0 +1,22 @@
+Index: src/build-data/buildh.in
+===================================================================
+--- src/build-data/buildh.in.orig
++++ src/build-data/buildh.in
+@@ -2,7 +2,7 @@
+ #ifndef BOTAN_BUILD_CONFIG_H__
+ #define BOTAN_BUILD_CONFIG_H__
+ 
+-/* This file was automatically generated %{timestamp} UTC */
++/* This file was automatically generated */
+ 
+ #define BOTAN_VERSION_MAJOR %{version_major}
+ #define BOTAN_VERSION_MINOR %{version_minor}
+@@ -50,7 +50,7 @@
+ %{local_config}
+ 
+ /*
+-%{user}@%{hostname} ran '%{command_line}'
++%{user} ran '%{command_line}'
+ 
+ Target
+ -------
diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000