Browse Source

upgrading package: botan 1.7.14 -> 1.7.15

master
parent
commit
7ac8aa1490
  1. 24
      botan/botan.patch
  2. 8
      botan/botan.spec

24
botan/botan.patch

@ -1,6 +1,6 @@
Index: src/build-data/cc/gcc Index: src/build-data/cc/gcc
--- src/build-data/cc/gcc.orig 2008-09-30 18:59:48 +0200 --- src/build-data/cc/gcc.orig 2008-10-07 23:13:19 +0200
+++ src/build-data/cc/gcc 2008-10-01 19:45:12 +0200 +++ src/build-data/cc/gcc 2008-10-08 08:33:47 +0200
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
add_lib_dir_option "-L" add_lib_dir_option "-L"
add_lib_option "-l" add_lib_option "-l"
@ -9,24 +9,24 @@ Index: src/build-data/cc/gcc
-warning_flags "-W -Wall" -warning_flags "-W -Wall"
+lang_flags "-D_REENTRANT -Wno-long-long" +lang_flags "-D_REENTRANT -Wno-long-long"
+warning_flags "" +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" lib_opt_flags "-O2 -finline-functions"
Index: src/build-data/makefile/unix.in 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.orig 2008-10-07 23:13:19 +0200
+++ src/build-data/makefile/unix.in 2008-10-01 19:45:12 +0200 +++ src/build-data/makefile/unix.in 2008-10-08 08:34:11 +0200
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
BINDIR = $(INSTALLROOT)/bin BINDIR = $(DESTDIR)/bin
LIBDIR = $(INSTALLROOT)/@{var:libdir} LIBDIR = $(DESTDIR)/@{var:libdir}
HEADERDIR = $(INSTALLROOT)/@{var:includedir}/botan HEADERDIR = $(DESTDIR)/@{var:includedir}/botan
-DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) -DOCDIR = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION)
+DOCDIR = $(INSTALLROOT)/@{var:docdir} +DOCDIR = $(DESTDIR)/@{var:docdir}
CONFIG_SCRIPT = @{var:botan-config} CONFIG_SCRIPT = @{var:botan-config}
Index: src/utils/types.h Index: src/utils/types.h
--- src/utils/types.h.orig 2008-09-30 18:59:48 +0200 --- src/utils/types.h.orig 2008-10-07 23:13:21 +0200
+++ src/utils/types.h 2008-10-01 19:45:12 +0200 +++ src/utils/types.h 2008-10-08 08:29:40 +0200
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
typedef unsigned __int64 u64bit; typedef unsigned __int64 u64bit;
#elif defined(__KCC) #elif defined(__KCC)

8
botan/botan.spec

@ -23,7 +23,7 @@
# package version # package version
%define V_major 1.7 %define V_major 1.7
%define V_minor 14 %define V_minor 15
# package information # package information
Name: botan Name: botan
@ -36,7 +36,7 @@ Class: EVAL
Group: Cryptography Group: Cryptography
License: BSD License: BSD
Version: %{V_major}.%{V_minor} Version: %{V_major}.%{V_minor}
Release: 20081001 Release: 20081008
# list of sources # list of sources
Source0: http://files.randombit.net/botan/archive/v%{V_major}/Botan-%{version}.tgz Source0: http://files.randombit.net/botan/archive/v%{V_major}/Botan-%{version}.tgz
@ -77,13 +77,13 @@ AutoReqProv: no
perl ./configure.pl \ perl ./configure.pl \
--prefix=%{l_prefix} \ --prefix=%{l_prefix} \
--docdir=share/botan \ --docdir=share/botan \
--no-shared --disable-shared
%{l_make} %{l_mflags -O} %{l_make} %{l_mflags -O}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install \ %{l_make} %{l_mflags} install \
INSTALLROOT=$RPM_BUILD_ROOT%{l_prefix} \ DESTDIR=$RPM_BUILD_ROOT%{l_prefix} \
OWNER=`%{l_shtool} echo -e '%u'` \ OWNER=`%{l_shtool} echo -e '%u'` \
GROUP=`%{l_shtool} echo -e '%g'` GROUP=`%{l_shtool} echo -e '%g'`
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/botan/*.txt rm -f $RPM_BUILD_ROOT%{l_prefix}/share/botan/*.txt

Loading…
Cancel
Save