From 634972220b44ae7ddc92767d69d07f9e5dbb0f29c2bd89813ad232a9054597ed Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 12 Mar 2010 00:10:58 +0000
Subject: [PATCH] Accepting request 34490 from devel:libraries:c_c++

checked in (request 34490)

OBS-URL: https://build.opensuse.org/request/show/34490
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=14
---
 Botan.changes                         |  6 ------
 Botan.spec                            |  2 --
 botan-1.8.8-binutils_lea_offset.patch | 28 ---------------------------
 3 files changed, 36 deletions(-)
 delete mode 100644 botan-1.8.8-binutils_lea_offset.patch

diff --git a/Botan.changes b/Botan.changes
index aa3bf64..7bef5d5 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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 c74b4d7..2f0387c 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -32,7 +32,6 @@ 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
 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
@@ -93,7 +92,6 @@ Authors:
 %patch0
 %patch1
 %patch2
-%patch3
 
 %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
deleted file mode 100644
index 378371f..0000000
--- a/botan-1.8.8-binutils_lea_offset.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#
-# 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