From 512f39e2a6a5673f987c4e83a972457f83d64fe5 Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Wed, 12 May 2010 17:38:19 +0200
Subject: development/bzr: Updated for version 1.14

---
 development/bzr/bzr.SlackBuild | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'development/bzr/bzr.SlackBuild')

diff --git a/development/bzr/bzr.SlackBuild b/development/bzr/bzr.SlackBuild
index e57db71f64..5eace83df9 100644
--- a/development/bzr/bzr.SlackBuild
+++ b/development/bzr/bzr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bzr
 
-# Copyright 2006-2008  Robby Workman  Northport, AL, USA
+# Copyright 2006-2009  Robby Workman  Northport, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bzr
-VERSION=1.5
+VERSION=1.14
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -56,13 +56,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix suggested by guys from #bzr at irc.freenode.net
-# Thanks to zpcspm@gmail.com for pointing this out to me
-patch tools/rst2html.py < $CWD/rst2html.py.patch
-
-# Generate docs
-make docs
-
+# Generate docs - this will fail if python docutils is not installed
+make docs 2>/dev/null || true
 python setup.py install --root=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -74,8 +69,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BRANCH.TODO COPYING.txt INSTALL NEWS README TODO doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  BRANCH.TODO COPYING.txt INSTALL NEWS README TODO doc/* \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3