upgrading package: botan 1.9.9 -> 1.9.12

botan/botan.patch

@@ -1,18 +1,6 @@
-Index: src/build-data/cc/gcc.txt
---- src/build-data/cc/gcc.txt.orig	2010-06-28 22:01:59.000000000 +0200
-+++ src/build-data/cc/gcc.txt	2010-06-29 15:39:51.000000000 +0200
-@@ -11,7 +11,7 @@
- add_lib_option -l
- 
- lang_flags "-D_REENTRANT -ansi -Wno-long-long"
--warning_flags "-W -Wall"
-+warning_flags ""
- 
- maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual"
- 
 Index: src/build-data/makefile/unix.in
---- src/build-data/makefile/unix.in.orig	2010-06-28 22:01:59.000000000 +0200
+--- src/build-data/makefile/unix.in.orig	2010-12-13 22:47:38.000000000 +0100
-+++ src/build-data/makefile/unix.in	2010-06-29 15:30:44.000000000 +0200
++++ src/build-data/makefile/unix.in	2010-12-14 09:30:48.000000000 +0100
 @@ -16,7 +16,7 @@
  BINDIR        = $(DESTDIR)/bin
  LIBDIR        = $(DESTDIR)/%{libdir}
@@ -23,10 +11,19 @@ Index: src/build-data/makefile/unix.in
  
  CONFIG_SCRIPT = %{botan_config}
 Index: src/utils/cpuid.cpp
---- src/utils/cpuid.cpp.orig	2010-06-28 22:01:59.000000000 +0200
+--- src/utils/cpuid.cpp.orig	2010-12-13 22:47:39.000000000 +0100
-+++ src/utils/cpuid.cpp	2010-06-29 15:30:44.000000000 +0200
++++ src/utils/cpuid.cpp	2010-12-14 09:38:08.000000000 +0100
+@@ -14,7 +14,7 @@
+   #include <sys/sysctl.h>
+ #endif
+ 
+-#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
++#if 0
+ 
+ #if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
+ 
 @@ -29,7 +29,7 @@
- #elif BOTAN_GCC_VERSION >= 430
+ #elif (BOTAN_GCC_VERSION >= 430) || defined(BOTAN_BUILD_COMPILER_IS_CLANG)
  
    // Only available starting in GCC 4.3
 -  #include <cpuid.h>
@@ -35,9 +32,9 @@ Index: src/utils/cpuid.cpp
      do { __get_cpuid(type, out, out+1, out+2, out+3); } while(0);
  
 Index: src/utils/types.h
---- src/utils/types.h.orig	2010-06-28 22:01:59.000000000 +0200
+--- src/utils/types.h.orig	2010-12-13 22:47:39.000000000 +0100
-+++ src/utils/types.h	2010-06-29 15:30:44.000000000 +0200
++++ src/utils/types.h	2010-12-14 09:30:48.000000000 +0100
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
     typedef unsigned __int64 u64bit;
  #elif defined(__KCC)
     typedef unsigned __long_long u64bit;

botan/botan.spec

@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_major 1.9
-%define       V_minor 9
+%define       V_minor 12
 
 #   package information
 Name:         botan
@@ -36,19 +36,15 @@ Class:        EVAL
 Group:        Cryptography
 License:      BSD
 Version:      %{V_major}.%{V_minor}
-Release:      20100629
+Release:      20101214
 
 #   list of sources
 Source0:      http://files.randombit.net/botan/v%{V_major}/Botan-%{version}.tgz
 Patch0:       botan.patch
 
 #   build information
-Prefix:       %{l_prefix}
+BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, gcc::with_cxx = yes, python, perl
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, gcc::with_cxx = yes, python
 PreReq:       OpenPKG, openpkg >= 20060823
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     Botan is a C++ cryptography library, providing a wide variety of