upgrading package: botan 1.9.17 -> 1.9.18

botan/botan.patch

@@ -1,18 +1,20 @@
 Index: src/build-data/makefile/unix.in
---- src/build-data/makefile/unix.in.orig	2011-04-11 22:46:36.000000000 +0200
-+++ src/build-data/makefile/unix.in	2011-04-12 11:03:09.000000000 +0200
-@@ -16,7 +16,7 @@
+--- src/build-data/makefile/unix.in.orig	2011-06-03 17:00:14.000000000 +0200
++++ src/build-data/makefile/unix.in	2011-06-04 11:13:54.000000000 +0200
+@@ -16,8 +16,8 @@
+ 
  BINDIR        = $(DESTDIR)/bin
  LIBDIR        = $(DESTDIR)/%{libdir}
- HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+-HEADERDIR     = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
 -DOCDIR        = $(DESTDIR)/%{docdir}/botan-$(VERSION)
++HEADERDIR     = $(DESTDIR)/%{includedir}/botan
 +DOCDIR        = $(DESTDIR)/%{docdir}
  PKGCONF_DIR   = $(LIBDIR)/pkgconfig
  
  CONFIG_SCRIPT = %{botan_config}
 Index: src/utils/cpuid.cpp
---- src/utils/cpuid.cpp.orig	2011-04-11 22:46:36.000000000 +0200
-+++ src/utils/cpuid.cpp	2011-04-12 11:03:09.000000000 +0200
+--- src/utils/cpuid.cpp.orig	2011-06-03 17:00:14.000000000 +0200
++++ src/utils/cpuid.cpp	2011-06-04 11:07:29.000000000 +0200
 @@ -14,7 +14,7 @@
    #include <sys/sysctl.h>
  #endif
@@ -23,8 +25,8 @@ Index: src/utils/cpuid.cpp
  #if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
  
 Index: src/utils/types.h
---- src/utils/types.h.orig	2011-04-11 22:46:36.000000000 +0200
-+++ src/utils/types.h	2011-04-12 11:03:09.000000000 +0200
+--- src/utils/types.h.orig	2011-06-03 17:00:14.000000000 +0200
++++ src/utils/types.h	2011-06-04 11:07:29.000000000 +0200
 @@ -43,7 +43,7 @@
     typedef unsigned __int64 u64bit;
  #elif defined(__KCC)

botan/botan.spec

@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_major 1.9
-%define       V_minor 17
+%define       V_minor 18
 
 #   package information
 Name:         botan
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Cryptography
 License:      BSD
 Version:      %{V_major}.%{V_minor}
-Release:      20110504
+Release:      20110604
 
 #   list of sources
 Source0:      http://files.randombit.net/botan/v%{V_major}/Botan-%{version}.tgz