From ad61f111e566f71962c8ee44f7fe510fdf660e2a Mon Sep 17 00:00:00 2001
From: Markus Reichelt
Date: Sat, 30 Jun 2012 12:05:56 -0400
Subject: libraries/Botan: Updated for version 1.10.2.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 libraries/Botan/Botan.SlackBuild | 17 ++++++-----------
 libraries/Botan/Botan.info       | 10 +++++-----
 libraries/Botan/slack-desc       |  4 ++--
 3 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'libraries')

diff --git a/libraries/Botan/Botan.SlackBuild b/libraries/Botan/Botan.SlackBuild
index eb3a05c80b..ece9302152 100644
--- a/libraries/Botan/Botan.SlackBuild
+++ b/libraries/Botan/Botan.SlackBuild
@@ -23,15 +23,11 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 #
-# markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
-# 2010 Jun 22 - initial release
-# 2011 Aug 28 - adapted to Botan-1.8.13
-# 2011 Sep 07 - adapted to Botan-1.10.1
-# 2012 Jan 11 - include python wrapper
+# Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=Botan
-VERSION=${VERSION:-1.10.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.10.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 #this kludge is required, courtesy of upstream
@@ -89,22 +85,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-boost-python \
   --with-doxygen
 
-sed -i 's/lbotan/lbotan-1.10/' Makefile.python
-
 make
+make check
+LD_PRELOAD="./libbotan-1.10.so" ./check --test
 make -f Makefile.python
 make -f Makefile.python install \
   PYTHON_ROOT=/usr/lib$LIBDIRSUFFIX/python2.6/config \
   PYTHON_SITE_PACKAGE_DIR=$PKG/usr/lib$LIBDIRSUFFIX/python2.6/site-packages
 make install DESTDIR=$PKG/usr
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Fix some stupid permissions before we move stuff.
 find doc -type d -exec chmod 0755 {} \;
 find doc -type f -exec chmod 0644 {} \;
-chmod 0755 doc/examples/python/*.py
 
 mv $PKG/usr/doc/$PRGNAMI-$VERSION/doxygen/  $PKG/usr/doc/$PRGNAMI-$VERSION/html/
 
diff --git a/libraries/Botan/Botan.info b/libraries/Botan/Botan.info
index ec28df6cbe..1d4660d830 100644
--- a/libraries/Botan/Botan.info
+++ b/libraries/Botan/Botan.info
@@ -1,10 +1,10 @@
 PRGNAM="Botan"
-VERSION="1.10.1"
+VERSION="1.10.2"
 HOMEPAGE="http://botan.randombit.net/"
-DOWNLOAD="http://botan.randombit.net/files/Botan-1.10.1.tbz"
-MD5SUM="7ae93e205491a8e75115bfca983ff7f9"
+DOWNLOAD="http://botan.randombit.net/files/Botan-1.10.2.tbz"
+MD5SUM="9722bce59a81f2f76742c4f307c5e6dc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="markus reichelt"
+MAINTAINER="Markus Reichelt"
 EMAIL="slackbuilds@mareichelt.de"
-APPROVED="dsomero,Erik Hanson"
+APPROVED="dsomero"
diff --git a/libraries/Botan/slack-desc b/libraries/Botan/slack-desc
index c58e8eccb9..7ff1eecabc 100644
--- a/libraries/Botan/slack-desc
+++ b/libraries/Botan/slack-desc
@@ -3,9 +3,9 @@
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# customary to leave one space after the ':' except on otherwise blank lines.
 
-     |----------handy-ruler------------------------------------------------|
+     |-----handy-ruler------------------------------------------------------|
 Botan: Botan (C++ crypto library)
 Botan:
 Botan: Botan is a BSD-licensed crypto library for C++. It provides
-- 
cgit v1.2.3