[botan] - Also remove RC5 from the tarfile. - Comment out RC5, RC6 and IDEA validation tests.

[Thomas Moschny]

commit 078189366acbc68bd162e9d091d481a0c61dba34
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Aug 28 22:59:59 2010 +0200

    - Also remove RC5 from the tarfile.
    - Comment out RC5, RC6 and IDEA validation tests.

 .gitignore |    4 ++--
 botan.spec |   11 ++++++++++-
 repack.sh  |    1 +
 sources    |    2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d957ed..7553998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-Botan-1.8.9.tbz
-Botan-1.8.9.stripped.tbz
+/Botan-1.8.9.tbz
+/Botan-1.8.9.stripped.tbz
diff --git a/botan.spec b/botan.spec
index 4666638..a23f37b 100644
--- a/botan.spec
+++ b/botan.spec
@@ -1,6 +1,6 @@
 Name:           botan
 Version:        1.8.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,10 +110,19 @@ rm -rf %{buildroot}
 
 %check
 make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
+
+# these checks would fail
+mv checks/validate.dat{,.orig}
+awk '/\[.*\]/{f=0} /\[(RC5.*|RC6|IDEA)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \
+    checks/validate.dat.orig > checks/validate.dat
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Fri Aug 27 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.9-3
+- Also remove RC5 from the tarfile.
+- Comment out RC5, RC6 and IDEA validation tests.
+
 * Wed Aug  4 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.9-2
 - Remove IDEA, RC6, and ECC-related modules from the tarfile,
   see bz 615372.
diff --git a/repack.sh b/repack.sh
index ecd1dfe..f192d72 100755
--- a/repack.sh
+++ b/repack.sh
@@ -13,6 +13,7 @@ ${compr} -cd ${name}${suffix} > ${tmpfile}
 
 tar --delete --file=${tmpfile} Botan-${version}/src/block/idea
 tar --delete --file=${tmpfile} Botan-${version}/src/block/rc6
+tar --delete --file=${tmpfile} Botan-${version}/src/block/rc5
 tar --delete --file=${tmpfile} Botan-${version}/src/math/gfpmath
 tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ec_dompar
 tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecc_key
diff --git a/sources b/sources
index 3fc5e59..2444871 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcf136c4e84c406809f1ffe2beba01c4  Botan-1.8.9.stripped.tbz
+6854af078d7e751bd76ffafe7a60e447  Botan-1.8.9.stripped.tbz