5 files changed, 37 insertions, 26 deletions
diff --git a/office/lyx/README b/office/lyx/README
index c34f2c55ca05..0091349bb9f0 100644
--- a/office/lyx/README
+++ b/office/lyx/README
@@ -1,7 +1,11 @@
 LyX - A WYSIWYM document processor.
 
-LyX is for people that write and want their writing to look great, right 
-out of the box.  No more endless tinkering with formatting details, 'finger 
-painting' font attributes or futzing around with page boundaries.  You just 
-write.  In the background, Prof. Knuth's legendary TeX typesetting engine 
-makes you look good.
+LyX is a document processor that encourages an approach to 
+writing based on the structure of your documents (WYSIWYM) 
+and not simply their appearance (WYSIWYG).
+
+LyX combines the power and flexibility of TeX/LaTeX with the 
+ease of use of a graphical interface.
+This results in world-class support for creation of mathematical 
+content (via a fully integrated equation editor) and structured 
+documents like academic articles, theses, and books.
diff --git a/office/lyx/doinst.sh b/office/lyx/doinst.sh
new file mode 100644
index 000000000000..9424ce43ff57
--- /dev/null
+++ b/office/lyx/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q 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
+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/lyx/lyx.SlackBuild b/office/lyx/lyx.SlackBuild
index 4519a7c94098..850d91c60858 100644
--- a/office/lyx/lyx.SlackBuild
+++ b/office/lyx/lyx.SlackBuild
@@ -1,13 +1,12 @@
 #!/bin/sh
 
-# Slackware build script for lyx
+# Slackware build script for LyX
+
+# Written by Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>
 
-# Written by core (eroc@linuxmail.org)
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-# Updated by Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>
 
 PRGNAM=lyx
-VERSION=${VERSION:-1.6.6}
+VERSION=${VERSION:-1.6.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,7 +43,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -62,10 +61,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-shared=yes \
-  --enable-static=no \
-  --with-aspell \
-  --with-enchant \
   --build=$ARCH-slackware-linux
 
 make
@@ -78,12 +73,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ANNOUNCE COPYING INSTALL* NEWS README* RELEASE-NOTES UPGRADING \
-  $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/lyx/lyx.info b/office/lyx/lyx.info
index 22cee6bd63d2..450f2f304614 100644
--- a/office/lyx/lyx.info
+++ b/office/lyx/lyx.info
@@ -1,10 +1,10 @@
 PRGNAM="lyx"
-VERSION="1.6.6"
+VERSION="1.6.7"
 HOMEPAGE="http://www.lyx.org"
-DOWNLOAD="ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-1.6.6.tar.gz"
-MD5SUM="0faa057c49f570eddb5474a639f0357e"
+DOWNLOAD="ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-1.6.7.tar.bz2"
+MD5SUM="078a3568f41ceb6dd5f090071aab93bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Morten Juhl-Johansen Zölde-Fejér"
 EMAIL="mjjzf@syntaktisk.dk"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/office/lyx/slack-desc b/office/lyx/slack-desc
index 26a4c366d83d..6e2210758e83 100644
--- a/office/lyx/slack-desc
+++ b/office/lyx/slack-desc
@@ -8,11 +8,11 @@
    |-----handy-ruler------------------------------------------------------|
 lyx: LyX (WYSIWYM document processor)
 lyx:
-lyx: LyX is for people that write and want their writing to look great,
-lyx: right out of the box. No more endless tinkering with formatting
-lyx: details, 'finger painting' font attributes or futzing around with
-lyx: page boundaries. You just write. In the background, Prof. Knuth's
-lyx: legendary TeX typesetting engine makes you look good.
+lyx: LyX is a document processor that encourages an approach to writing 
+lyx: based on the structure of your documents (WYSIWYM) and not simply 
+lyx: their appearance (WYSIWYG).
+lyx: LyX combines the power and flexibility of TeX/LaTeX with the ease of 
+lyx: use of a graphical interface.
 lyx:
 lyx: Homepage: http://www.lyx.org
 lyx: