diff options
-rw-r--r-- | office/mupdf/mupdf.SlackBuild | 24 | ||||
-rw-r--r-- | office/mupdf/mupdf.info | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild index 8253dde59ca0..680e8d9aa0e5 100644 --- a/office/mupdf/mupdf.SlackBuild +++ b/office/mupdf/mupdf.SlackBuild @@ -5,6 +5,15 @@ # Originally written by Hubert Hesse (slackbuilds@hubertscorner.de). # Heavily modified by B. Watson (yalhcru@gmail.com). +# 20140827 bkw: fix quality control fails in previous version. +# 2 issues pointed out by Thomas Morper in an email: +# - The source is already found in upstream's archive/, and won't get +# moved, so update DOWNLOAD in the .info file to point there. +# - Get rid of redundant /usr/share/doc/mupdf dir. +# +# Also, I forgot to reset BUILD to 1 when VERSION changed, so this +# will be build "4" of 1.5 even thought it's really the 2nd one :( + # 20140822 bkw: # - Updated for mupdf-1.5. # - Hosting the source on my server, so I know it won't get moved @@ -55,7 +64,7 @@ PRGNAM=mupdf VERSION=${VERSION:-1.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -111,10 +120,10 @@ rm -rf thirdparty/* 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 640 -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; # opj_stream_set_user_data() now takes 3 args in openjpeg 2.1. # Patch applies to both 1.4 and 1.5. @@ -136,6 +145,7 @@ make \ prefix=/usr \ libdir=/usr/lib$LIBDIRSUFFIX \ mandir=/usr/man \ + docdir=/usr/doc/$PRGNAM-$VERSION \ DESTDIR=$PKG \ install @@ -188,8 +198,8 @@ sed -e "s,@LIB@,lib$LIBDIRSUFFIX,g" \ WITH=without [ "$MUJS" = "yes" ] && WITH=with -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README COPYING CHANGES CONTRIBUTORS docs/*.* $PKG/usr/doc/$PRGNAM-$VERSION +# 'make install' already installed most of the docs. +cp -a CONTRIBUTORS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/mupdf/mupdf.info b/office/mupdf/mupdf.info index 20d7fd1b24dd..4a8743db9345 100644 --- a/office/mupdf/mupdf.info +++ b/office/mupdf/mupdf.info @@ -1,7 +1,7 @@ PRGNAM="mupdf" VERSION="1.5" HOMEPAGE="http://www.mupdf.com/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mupdf-1.5-source.tar.gz" +DOWNLOAD="http://mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz" MD5SUM="89bd4ddc74c266062ebf2702741bb173" DOWNLOAD_x86_64="" MD5SUM_x86_64="" |