diff options
| -rw-r--r-- | libraries/Jinja2/Jinja2.SlackBuild | 40 | ||||
| -rw-r--r-- | libraries/Jinja2/Jinja2.info | 10 | ||||
| -rw-r--r-- | libraries/Jinja2/README | 9 | ||||
| -rw-r--r-- | libraries/Jinja2/fix_doc_build.patch | 11 | ||||
| -rw-r--r-- | libraries/Jinja2/slack-desc | 2 |
5 files changed, 31 insertions, 41 deletions
diff --git a/libraries/Jinja2/Jinja2.SlackBuild b/libraries/Jinja2/Jinja2.SlackBuild index ea04289012..0f77871454 100644 --- a/libraries/Jinja2/Jinja2.SlackBuild +++ b/libraries/Jinja2/Jinja2.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for Jinja2 # Copyright 2014 Mikko Värri, Finland +# Copyright 2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=Jinja2 -VERSION=${VERSION:-2.7.3} +VERSION=${VERSION:-2.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,7 +41,19 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS=${DOCS:-no} +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi set -e @@ -52,25 +65,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; python setup.py install --root=$PKG -if [ "$DOCS" = "yes" ]; then - # Patch from: https://github.com/mitsuhiko/jinja2/pull/259 - patch -p0 <$CWD/fix_doc_build.patch - make -C docs html -fi - -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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGES LICENSE ext examples $PKG/usr/doc/$PRGNAM-$VERSION -cp -a docs/_build/html $PKG/usr/doc/$PRGNAM-$VERSION || cp -a docs $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS CHANGES.rst LICENSE README.rst \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/Jinja2/Jinja2.info b/libraries/Jinja2/Jinja2.info index b5a4c09c92..3a729808f7 100644 --- a/libraries/Jinja2/Jinja2.info +++ b/libraries/Jinja2/Jinja2.info @@ -1,10 +1,10 @@ PRGNAM="Jinja2" -VERSION="2.7.3" +VERSION="2.10" HOMEPAGE="https://pypi.python.org/pypi/Jinja2" -DOWNLOAD="https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.7.3.tar.gz" -MD5SUM="b9dffd2f3b43d673802fe857c8445b1a" +DOWNLOAD="https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-2.10.tar.gz" +MD5SUM="61ef1117f945486472850819b8d1eb3d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="MarkupSafe" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="Benjamin Trigona-Harany" +EMAIL="slackbuilds@jaxartes.net" diff --git a/libraries/Jinja2/README b/libraries/Jinja2/README index d389ee4ef5..59256ea09d 100644 --- a/libraries/Jinja2/README +++ b/libraries/Jinja2/README @@ -1,10 +1,3 @@ -Jinja2 is a template engine written in pure Python. It provides a +Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. - -Circular dependencies warning: The DOCS=yes flag needs the optional -dependency Sphinx, which needs Jinja2, which needs Sphinx because -DOCS=yes ... So... If you really need the docs, build Jinja2 -without the DOCS=yes flag, build Sphinx, then rebuild Jinja2 with -DOCS=yes. Incidentally, unless you are a developer, you don't -normally need the DOCS=yes flag. diff --git a/libraries/Jinja2/fix_doc_build.patch b/libraries/Jinja2/fix_doc_build.patch deleted file mode 100644 index 4caa78adeb..0000000000 --- a/libraries/Jinja2/fix_doc_build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/jinjaext.py 2014-01-10 12:14:43.000000000 +0200 -+++ docs/jinjaext.py.patched 2014-01-24 23:31:50.511110780 +0200 -@@ -23,7 +23,7 @@ - from pygments.token import Keyword, Name, Comment, String, Error, \ - Number, Operator, Generic - from jinja2 import Environment, FileSystemLoader --from jinja2.utils import next -+from jinja2._compat import next - - - def parse_rst(state, content_offset, doc): diff --git a/libraries/Jinja2/slack-desc b/libraries/Jinja2/slack-desc index 11066a1677..8b4b8a0873 100644 --- a/libraries/Jinja2/slack-desc +++ b/libraries/Jinja2/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| Jinja2: Jinja2 (Template engine for Python) Jinja2: -Jinja2: Jinja2 is a template engine written in pure Python. It provides a +Jinja2: Jinja2 is a template engine written in pure Python. It provides a Jinja2: Django inspired non-XML syntax but supports inline expressions and Jinja2: an optional sandboxed environment. Jinja2: |