diff options
| author | Frank Caraballo <fecaraballo{at}gmail{dot}com> | 2010-05-13 00:39:30 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:39:30 +0200 |
| commit | eacec8eaa853d3425fc51ef09aa9441b49d91c0f (patch) | |
| tree | 8807a271059aae261e35d7a40542dda9448defa4 | |
| parent | 5cfebcb29d207e4239a1760043e5a71c9df342c2 (diff) | |
office/xpad: Updated for version 3.0
| -rw-r--r-- | office/xpad/doinst.sh | 8 | ||||
| -rw-r--r-- | office/xpad/xpad.SlackBuild | 26 | ||||
| -rw-r--r-- | office/xpad/xpad.info | 2 |
3 files changed, 25 insertions, 11 deletions
diff --git a/office/xpad/doinst.sh b/office/xpad/doinst.sh index 174d6f9e8977d..1f8ff67dedb29 100644 --- a/office/xpad/doinst.sh +++ b/office/xpad/doinst.sh @@ -1,4 +1,10 @@ if [ -x /usr/bin/update-desktop-database ]; then - ./usr/bin/update-desktop-database -q usr/share/applications + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi fi diff --git a/office/xpad/xpad.SlackBuild b/office/xpad/xpad.SlackBuild index d61a7af03e8b7..3d9bf1dd18f7f 100644 --- a/office/xpad/xpad.SlackBuild +++ b/office/xpad/xpad.SlackBuild @@ -35,18 +35,23 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -57,14 +62,14 @@ find . \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux \ - || exit 1 + --build=$ARCH-slackware-linux -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 +make +make install-strip DESTDIR=$PKG ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; @@ -72,8 +77,9 @@ make install-strip DESTDIR=$PKG || exit 1 ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -81,4 +87,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh 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/office/xpad/xpad.info b/office/xpad/xpad.info index 5b9e728b2eb18..53a2edd9c1610 100644 --- a/office/xpad/xpad.info +++ b/office/xpad/xpad.info @@ -3,6 +3,8 @@ VERSION="3.0" HOMEPAGE="http://mterry.name/xpad/" DOWNLOAD="http://launchpad.net/xpad/stable/3.0/+download/xpad-3.0.tar.bz2" MD5SUM="47e59f13252591f13cc9f611e34731be" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Frank Caraballo" EMAIL="fecaraballo{at}gmail{dot}com" APPROVED="dsomero" |