4 files changed, 25 insertions, 18 deletions
diff --git a/development/xmlcopyeditor/README b/development/xmlcopyeditor/README
index b9c245c04d..9fed502c62 100644
--- a/development/xmlcopyeditor/README
+++ b/development/xmlcopyeditor/README
@@ -1,6 +1,6 @@
 XML Copy Editor is a fast, free, validating XML editor.
 
-Requires: boost, xerces-c and wxPython.
+Xmlcopyeditor requires xerces-c and wxPython.
 
 Note: This slackbuild will fail if wxGTK is installed,
 as it is missing a needed header file.
diff --git a/development/xmlcopyeditor/slack-desc b/development/xmlcopyeditor/slack-desc
index 4d7eeaf570..a8700015e0 100644
--- a/development/xmlcopyeditor/slack-desc
+++ b/development/xmlcopyeditor/slack-desc
@@ -11,9 +11,9 @@ xmlcopyeditor:
 xmlcopyeditor: XML Copy Editor is a fast, free, validating XML editor.
 xmlcopyeditor: 
 xmlcopyeditor: Homepage: http://xml-copy-editor.sourceforge.net/
-xmlcopyeditor: 
-xmlcopyeditor: 
-xmlcopyeditor: 
-xmlcopyeditor: 
-xmlcopyeditor: 
-xmlcopyeditor: 
+xmlcopyeditor:
+xmlcopyeditor:
+xmlcopyeditor:
+xmlcopyeditor:
+xmlcopyeditor:
+xmlcopyeditor:
diff --git a/development/xmlcopyeditor/xmlcopyeditor.SlackBuild b/development/xmlcopyeditor/xmlcopyeditor.SlackBuild
index 40e8db418d..7b351541ee 100644
--- a/development/xmlcopyeditor/xmlcopyeditor.SlackBuild
+++ b/development/xmlcopyeditor/xmlcopyeditor.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=xmlcopyeditor
-VERSION=${VERSION:-1.2.0.4}
+VERSION=${VERSION:-1.2.0.6}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -32,7 +32,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-2.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -43,6 +43,7 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -55,15 +56,19 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "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 INSTALL \
   $PKG/usr/doc/$PRGNAM-$VERSION
-# xmlcopyeditor decided to package every license under the sun.
-# So I guess we'll package them too.
-mv $PKG/usr/share/$PRGNAM/copying $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -71,4 +76,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/development/xmlcopyeditor/xmlcopyeditor.info b/development/xmlcopyeditor/xmlcopyeditor.info
index e60858accf..a9101139fb 100644
--- a/development/xmlcopyeditor/xmlcopyeditor.info
+++ b/development/xmlcopyeditor/xmlcopyeditor.info
@@ -1,8 +1,10 @@
 PRGNAM="xmlcopyeditor"
-VERSION="1.2.0.4"
+VERSION="1.2.0.6"
 HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/xml-copy-editor/xmlcopyeditor-1.2.0.4.tar.gz"
-MD5SUM="0b85649a4ef6af817b1c4089237b2a57"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/xml-copy-editor/xmlcopyeditor-1.2.0.6-2.tar.gz"
+MD5SUM="fc92fa4767099e1bb8c076f91b038f1c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"