From 20518965afb09382eaa10d86df17226b067ceac5c7e6e105ef6aecf0a62fe777 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sat, 15 Sep 2012 06:55:58 +0000
Subject: [PATCH] Accepting request 134378 from
home:posophe:branches:devel:libraries:c_c++
fix patch removing in .changes file
OBS-URL: https://build.opensuse.org/request/show/134378
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=35
---
Botan-1.10.0.tar.bz2 | 3 ---
Botan-1.10.3.tar.bz2 | 3 +++
Botan-qt_thread_support.patch | 24 ------------------------
Botan.changes | 12 ++++++++++++
Botan.spec | 6 ++----
5 files changed, 17 insertions(+), 31 deletions(-)
delete mode 100644 Botan-1.10.0.tar.bz2
create mode 100644 Botan-1.10.3.tar.bz2
delete mode 100644 Botan-qt_thread_support.patch
diff --git a/Botan-1.10.0.tar.bz2 b/Botan-1.10.0.tar.bz2
deleted file mode 100644
index f4e9dc7..0000000
--- a/Botan-1.10.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65669a2ba74e07e1fa9ec5435c4785a5d901e4b5ca504701e9ec561513448aeb
-size 2188918
diff --git a/Botan-1.10.3.tar.bz2 b/Botan-1.10.3.tar.bz2
new file mode 100644
index 0000000..681deb9
--- /dev/null
+++ b/Botan-1.10.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95bc62e9ac08d26f5672cf469bfd0b83b42f4c7295c49c1a81dabcf4504d6767
+size 2218471
diff --git a/Botan-qt_thread_support.patch b/Botan-qt_thread_support.patch
deleted file mode 100644
index a8441aa..0000000
--- a/Botan-qt_thread_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/mutex/qt_mutex/mux_qt.cpp
-===================================================================
---- src/mutex/qt_mutex/mux_qt.cpp.orig 2011-06-20 15:52:09.000000000 +0200
-+++ src/mutex/qt_mutex/mux_qt.cpp 2011-06-21 14:56:14.738269417 +0200
-@@ -9,7 +9,7 @@
- #include <botan/internal/mux_qt.h>
- #include <qmutex.h>
-
--#if !defined(QT_THREAD_SUPPORT)
-+#if !(defined(QT_THREAD_SUPPORT) || !defined(QT_NO_THREAD))
- #error Your version of Qt does not support threads or mutexes
- #endif
-
-Index: src/mutex/qt_mutex/info.txt
-===================================================================
---- src/mutex/qt_mutex/info.txt.orig 2011-06-20 15:52:09.000000000 +0200
-+++ src/mutex/qt_mutex/info.txt 2011-06-21 14:55:17.957040061 +0200
-@@ -13,5 +13,5 @@ mux_qt.h
- # I think we want to always use qt-mt, not qt -- not much point in supporting
- # mutexes in a single threaded application, after all.
- <libs>
--all -> qt-mt
-+all -> QtCore
- </libs>
diff --git a/Botan.changes b/Botan.changes
index 897e2be..17b8c65 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri Sep 14 20:08:15 UTC 2012 - p.drouand@gmail.com
+
+- update to 1.10.3:
+ * A change in 1.10.2 accidentally broke ABI compatibility with
+ 1.10.1 and earlier versions, causing programs compiled against
+ 1.10.1 to crash if linked with 1.10.2 at runtime.
+ * Recent versions of OpenSSL include extra information in ECC
+ private keys, the presence of which caused an exception when such
+ a key was loaded by botan. The decoding of ECC private keys has been
+ changed to ignore these fields if they are set.
+- remove Botan-qt_thread_support.patch no needed anymore
+-------------------------------------------------------------------
Thu Aug 16 09:06:44 UTC 2012 - dmueller@suse.com
- don't fiddle with march settings, we want the distro defaults
diff --git a/Botan.spec b/Botan.spec
index 55d3a83..7b69aba 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -20,19 +20,18 @@
%define short_version 1.10
Name: Botan
-Version: 1.10.0
+Version: 1.10.3
Release: 0
Url: http://botan.randombit.net
Summary: A C++ Crypto Library
License: BSD-3-Clause
Group: Development/Libraries/C and C++
-Source: Botan-1.10.0.tar.bz2
+Source: Botan-%{version}.tar.bz2
Source2: baselibs.conf
Patch0: Botan-inttypes.patch
Patch1: Botan-ull_constants.patch.bz2
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
@@ -87,7 +86,6 @@ programs that use the Botan library.
%patch1
%patch2
%patch4
-%patch5
%patch6
%patch7