office/scribus: Updated for version 1.3.3.12

4 files changed, 42 insertions, 31 deletions

diff --git a/office/scribus/doinst.sh b/office/scribus/doinst.sh
index 34fcca8e04..0010e3238b 100644
--- a/office/scribus/doinst.sh
+++ b/office/scribus/doinst.sh
@@ -1,9 +1,9 @@
 
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index 25f5d1019f..c1b17f9858 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for scribus
 
-# Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
+# Copyright 2006 Martin Lefebvre <dadexter@gmail.com>
+# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,13 +26,12 @@
 # Modified by the SlackBuilds.org project
 # Including input by Yalla-One and some code cleanup by rworkman
 
-set -e
-
 PRGNAM=scribus
-VERSION=1.3.3.9
+VERSION=1.3.3.12
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -41,8 +41,12 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -52,28 +56,35 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --enable-cairo 
+cmake \
+  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  -DRENDER_LIB=CAIRO
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
 # Install .desktop file and mime information
-install -m 0644 -D scribus.desktop $PKG/usr/share/applications/kde/scribus.desktop
-install -m 0644 -D scribus.xml $PKG/usr/share/mime/packages/scribus.xml
+install -m 0644 -D vnd.scribus.desktop $PKG/usr/share/applications/scribus.desktop
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/share/man $PKG/usr
+mkdir -p $PKG/usr/man/de/man1
+mv $PKG/usr/man/man1/scribus.1.de $PKG/usr/man/de/man1/scribus.1
+
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/scribus $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index e7864d4ef4..b5271e47c1 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,8 @@
 PRGNAM="scribus"
-VERSION="1.3.3.9"
+VERSION="1.3.3.12"
 HOMEPAGE="http://www.scribus.net"
-DOWNLOAD="http://dl.sourceforge.net/scribus/scribus-1.3.3.9.tar.bz2"
-MD5SUM="a3d7af62d99d4e0f7485ae549de50df0"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@gmail.com"
-APPROVED="BP{k},rworkman"
+DOWNLOAD="http://downloads.sourceforge.net/scribus/scribus-1.3.3.12.tar.bz2"
+MD5SUM="48f6d762809ad714b366d8d4fc82d5c3"
+MAINTAINER="ppr:kut"
+EMAIL="pprkut@liwjatan.at"
+APPROVED="David Somero"
\ No newline at end of file
diff --git a/office/scribus/slack-desc b/office/scribus/slack-desc
index e4a351c3d6..3ac8a26343 100644
--- a/office/scribus/slack-desc
+++ b/office/scribus/slack-desc
@@ -7,13 +7,13 @@
 
        |-----handy-ruler------------------------------------------------------|
 scribus: Scribus (open-source professional page layout program)
-scribus: 
+scribus:
 scribus: Scribus is an open-source program that brings award-winning
 scribus: professional page layout to Linux/Unix, MacOS X and Windows
 scribus: desktops with a combination of "press-ready" output and new
 scribus: approaches to page layout.
-scribus: 
-scribus: 
-scribus: 
-scribus: 
-scribus: 
+scribus:
+scribus:
+scribus:
+scribus:
+scribus: