diff --git a/libraries/reportlab/README b/libraries/reportlab/README index 6cb7da41dd..2ad3ab4aad 100644 --- a/libraries/reportlab/README +++ b/libraries/reportlab/README @@ -21,6 +21,3 @@ It has the following features: - strong community support - platform-independent - includes PythonPoint - PDF Presentation Tool - -If pil (Python Imaging library) is installed (it is also available from -Slackbuilds.org), reportlab can use it for working with bitmap images. diff --git a/libraries/reportlab/reportlab.SlackBuild b/libraries/reportlab/reportlab.SlackBuild index 0f1eef1c32..589b0788a4 100644 --- a/libraries/reportlab/reportlab.SlackBuild +++ b/libraries/reportlab/reportlab.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified by SlackBuilds.org + PRGNAM=reportlab VERSION=${VERSION:-2.3} ARCH=${ARCH:-i486} @@ -36,10 +38,19 @@ OUTPUT=${OUTPUT:-/tmp} SRC_PRGNAM=ReportLab SRC_VERSION=$(echo $VERSION | tr . _) +if [ "$ARCH" = "i486" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +fi + # directory for python packages -PYTHONDIR=$(python -c 'import sys, os; print os.path.join("/usr/lib", "python%s" % sys.version[:3], "site-packages")') +PYTHONDIR=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')") + DOCFILES="CHANGES.txt LICENSE.txt README.txt docs/*.pdf" -OTHERPYFILES="demos tools tests" # tests restored +OTHERPYFILES="demos tools tests" set -e @@ -57,12 +68,6 @@ chmod -R u+w,go+r-w,a-s . # workaround due to dependency loop if reportlab isn't previously installed PYTHONPATH=$PYTHONPATH:$TMP/${SRC_PRGNAM}_${SRC_VERSION}/src/ python genAll.py ) - -# Move documentation .pdf files and text files to avoid file duplication in -# python directory -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mv $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION/ -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Move demos, tests and tools directories into python package's home # and remove duplicated file @@ -71,14 +76,19 @@ mv $OTHERPYFILES $PKG/$PYTHONDIR/$PRGNAM rm -f $PKG/$PYTHONDIR/$PRGNAM/tools/docco/*.pdf cd $TMP/${SRC_PRGNAM}_${SRC_VERSION} -python setup.py build || exit 1 python setup.py install --root=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - + +# Move documentation .pdf files and text files to avoid file duplication in +# python directory +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION/ +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/reportlab/reportlab.info b/libraries/reportlab/reportlab.info index a3a3900dc6..aa72d0b80d 100644 --- a/libraries/reportlab/reportlab.info +++ b/libraries/reportlab/reportlab.info @@ -2,7 +2,9 @@ PRGNAM="reportlab" VERSION="2.3" HOMEPAGE="http://www.reportlab.org/" DOWNLOAD="http://www.reportlab.org/ftp/ReportLab_2_3.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="057b846bd3b7b2c3498bf14f6a523632" +MD5SUM_x86_64="" MAINTAINER="LukenShiro" EMAIL="lukenshiro@ngi.it" -APPROVED="dsomero" +APPROVED="dsomero,pprkut" diff --git a/libraries/reportlab/slack-desc b/libraries/reportlab/slack-desc index 14b8405bc0..db0d8c1506 100644 --- a/libraries/reportlab/slack-desc +++ b/libraries/reportlab/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| reportlab: reportlab (PDF generation toolkit using python) reportlab: reportlab: The ReportLab Open Source PDF library is a proven industry-strength