OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Oct-2008 08:59:48
Branch: HEAD Handle: 2008100807594701
Modified files:
openpkg-src/botan botan.patch botan.spec
Log:
upgrading package: botan 1.7.14 -> 1.7.15
Summary:
Revision Changes Path
1.10 +12 -12 openpkg-src/botan/botan.patch
1.17 +4 -4 openpkg-src/botan/botan.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/botan/botan.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 botan.patch
--- openpkg-src/botan/botan.patch 1 Oct 2008 17:46:49 -0000 1.9
+++ openpkg-src/botan/botan.patch 8 Oct 2008 06:59:47 -0000 1.10
@@ -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 @@
-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)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/botan/botan.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 botan.spec
--- openpkg-src/botan/botan.spec 1 Oct 2008 17:46:49 -0000 1.16
+++ openpkg-src/botan/botan.spec 8 Oct 2008 06:59:48 -0000 1.17
@@ -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 @@
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 @@
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
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
