Browse Source

upgrading package: botan 1.7.13 -> 1.7.14

Ralf S. Engelschall 17 years ago
parent
commit
156b4d6538
2 changed files with 21 additions and 21 deletions
  1. 18 18
      botan/botan.patch
  2. 3 3
      botan/botan.spec

+ 18 - 18
botan/botan.patch

@@ -1,18 +1,6 @@
-Index: include/types.h
---- include/types.h.orig	2008-09-18 16:48:26 +0200
-+++ include/types.h	2008-09-18 19:54:39 +0200
-@@ -20,7 +20,7 @@
-    typedef unsigned __int64 u64bit;
- #elif defined(__KCC)
-    typedef unsigned __long_long u64bit;
--#elif defined(__GNUG__)
-+#elif defined(__GNUC__)
-    __extension__ typedef unsigned long long u64bit;
- #else
-    typedef unsigned long long u64bit;
-Index: misc/config/cc/gcc
---- misc/config/cc/gcc.orig	2008-09-18 16:48:26 +0200
-+++ misc/config/cc/gcc	2008-09-18 19:56:23 +0200
+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
 @@ -8,8 +8,8 @@
  add_lib_dir_option "-L"
  add_lib_option "-l"
@@ -24,9 +12,9 @@ Index: misc/config/cc/gcc
  #warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations"
  
  lib_opt_flags "-O2 -finline-functions"
-Index: misc/config/makefile/unix.in
---- misc/config/makefile/unix.in.orig	2008-09-18 16:48:26 +0200
-+++ misc/config/makefile/unix.in	2008-09-18 19:54:39 +0200
+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
 @@ -26,7 +26,7 @@
  BINDIR        = $(INSTALLROOT)/bin
  LIBDIR        = $(INSTALLROOT)/@{var:libdir}
@@ -36,3 +24,15 @@ Index: misc/config/makefile/unix.in
  
  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
+@@ -20,7 +20,7 @@
+    typedef unsigned __int64 u64bit;
+ #elif defined(__KCC)
+    typedef unsigned __long_long u64bit;
+-#elif defined(__GNUG__)
++#elif defined(__GNUC__)
+    __extension__ typedef unsigned long long u64bit;
+ #else
+    typedef unsigned long long u64bit;

+ 3 - 3
botan/botan.spec

@@ -23,7 +23,7 @@
 
 #   package version
 %define       V_major 1.7
-%define       V_minor 13
+%define       V_minor 14
 
 #   package information
 Name:         botan
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Cryptography
 License:      BSD
 Version:      %{V_major}.%{V_minor}
-Release:      20080928
+Release:      20081001
 
 #   list of sources
 Source0:      http://files.randombit.net/botan/archive/v%{V_major}/Botan-%{version}.tgz
@@ -72,7 +72,7 @@ AutoReqProv:  no
     rm -f src/*.bak
     %{l_shtool} subst \
         -e 's;-mcpu=;-mtune=;g' \
-        misc/config/cc/gcc
+        src/build-data/cc/gcc
     CC="gcc" \
     perl ./configure.pl \
         --prefix=%{l_prefix} \