From 7ac8aa149072f08956949cdd0c5cc3a400adfec9 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Wed, 8 Oct 2008 06:59:47 +0000
Subject: [PATCH] upgrading package: botan 1.7.14 -> 1.7.15

---
 botan/botan.patch | 24 ++++++++++++------------
 botan/botan.spec  |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/botan/botan.patch b/botan/botan.patch
index e68d7f6c99..e4cb1c18bf 100644
--- a/botan/botan.patch
+++ b/botan/botan.patch
@@ -1,6 +1,6 @@
 Index: src/build-data/cc/gcc
---- src/build-data/cc/gcc.orig	2008-09-30 18:59:48 +0200
-+++ src/build-data/cc/gcc	2008-10-01 19:45:12 +0200
+--- src/build-data/cc/gcc.orig	2008-10-07 23:13:19 +0200
++++ src/build-data/cc/gcc	2008-10-08 08:33:47 +0200
 @@ -8,8 +8,8 @@
  add_lib_dir_option "-L"
  add_lib_option "-l"
@@ -9,24 +9,24 @@ Index: src/build-data/cc/gcc
 -warning_flags "-W -Wall"
 +lang_flags "-D_REENTRANT -Wno-long-long"
 +warning_flags ""
- #warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations"
+ #warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter"
  
  lib_opt_flags "-O2 -finline-functions"
 Index: src/build-data/makefile/unix.in
---- src/build-data/makefile/unix.in.orig	2008-09-30 18:59:48 +0200
-+++ src/build-data/makefile/unix.in	2008-10-01 19:45:12 +0200
+--- src/build-data/makefile/unix.in.orig	2008-10-07 23:13:19 +0200
++++ src/build-data/makefile/unix.in	2008-10-08 08:34:11 +0200
 @@ -26,7 +26,7 @@
- BINDIR        = $(INSTALLROOT)/bin
- LIBDIR        = $(INSTALLROOT)/@{var:libdir}
- HEADERDIR     = $(INSTALLROOT)/@{var:includedir}/botan
--DOCDIR        = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION)
-+DOCDIR        = $(INSTALLROOT)/@{var:docdir}
+ BINDIR        = $(DESTDIR)/bin
+ LIBDIR        = $(DESTDIR)/@{var:libdir}
+ HEADERDIR     = $(DESTDIR)/@{var:includedir}/botan
+-DOCDIR        = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION)
++DOCDIR        = $(DESTDIR)/@{var:docdir}
  
  CONFIG_SCRIPT = @{var:botan-config}
  
 Index: src/utils/types.h
---- src/utils/types.h.orig	2008-09-30 18:59:48 +0200
-+++ src/utils/types.h	2008-10-01 19:45:12 +0200
+--- src/utils/types.h.orig	2008-10-07 23:13:21 +0200
++++ src/utils/types.h	2008-10-08 08:29:40 +0200
 @@ -20,7 +20,7 @@
     typedef unsigned __int64 u64bit;
  #elif defined(__KCC)
diff --git a/botan/botan.spec b/botan/botan.spec
index 132a78e432..7e353e73ee 100644
--- a/botan/botan.spec
+++ b/botan/botan.spec
@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_major 1.7
-%define       V_minor 14
+%define       V_minor 15
 
 #   package information
 Name:         botan
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Cryptography
 License:      BSD
 Version:      %{V_major}.%{V_minor}
-Release:      20081001
+Release:      20081008
 
 #   list of sources
 Source0:      http://files.randombit.net/botan/archive/v%{V_major}/Botan-%{version}.tgz
@@ -77,13 +77,13 @@ AutoReqProv:  no
     perl ./configure.pl \
         --prefix=%{l_prefix} \
         --docdir=share/botan \
-        --no-shared
+        --disable-shared
     %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install \
-        INSTALLROOT=$RPM_BUILD_ROOT%{l_prefix} \
+        DESTDIR=$RPM_BUILD_ROOT%{l_prefix} \
         OWNER=`%{l_shtool} echo -e '%u'` \
         GROUP=`%{l_shtool} echo -e '%g'`
     rm -f $RPM_BUILD_ROOT%{l_prefix}/share/botan/*.txt