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