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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65669a2ba74e07e1fa9ec5435c4785a5d901e4b5ca504701e9ec561513448aeb
-size 2188918

Botan-1.10.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95bc62e9ac08d26f5672cf469bfd0b83b42f4c7295c49c1a81dabcf4504d6767
+size 2218471

Botan-qt_thread_support.patch

@@ -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>

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

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