4 files changed, 33 insertions, 11 deletions
diff --git a/desktop/parcellite/README b/desktop/parcellite/README
index 1c914f32120f..7c0ccd5f7694 100644
--- a/desktop/parcellite/README
+++ b/desktop/parcellite/README
@@ -1,9 +1,9 @@
-Parcellite is a lightweight GTK+ clipboard manager.  This is a stripped 
-down, basic-features-only clipboard manager with a small memory footprint 
+Parcellite is a lightweight GTK+ clipboard manager.  This is a stripped
+down, basic-features-only clipboard manager with a small memory footprint
 for those who like simplicity.
 
 Parcellite features a clipboard CLI.  Unrecognized options and the
-contents of your standard input get copied to your clipboard. 
+contents of your standard input get copied to your clipboard.
 See the man page for examples.
 
 Features
@@ -12,3 +12,7 @@ Features
    * Daemon mode; guard your clipboard contents when you close applications.
    * Global hotkeys to display your items quickly.
    * Perform custom commands using clipboard contents.
+
+If you prefer using stock GTK icons (based on your GTK theme) as opposed to
+the new Parcellite icon, then simply run the script like this:
+  NOICON=YES ./parcellite.SlackBuild
diff --git a/desktop/parcellite/parcellite.SlackBuild b/desktop/parcellite/parcellite.SlackBuild
index 1c722b1dd584..18a3019248c1 100644
--- a/desktop/parcellite/parcellite.SlackBuild
+++ b/desktop/parcellite/parcellite.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=parcellite
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-1.0.2rc2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -23,6 +23,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# If set to "YES" then parcellite will use GTK Stock Icon based upon theme
+NOICON=${NOICON:-NO}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -48,6 +51,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$NOICON" = "YES" ]; then
+  # Force parcellite to use the stock GTK icons
+  sed -i "s/gtk_status_icon_new_from_icon_name(PARCELLITE_ICON)/gtk_status_icon_new_from_stock(PARCELLITE_ICON)/" src/main.c
+  sed -i "s/PARCELLITE_ICON/GTK_STOCK_PASTE/" src/main.c
+  sed -i "s/#define GTK_STOCK_PASTE \"parcellite\"//" src/main.c
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -59,6 +69,14 @@ CPPFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
 
+if [ "$NOICON" = "YES" ]; then
+  sed -i "s/Icon=parcellite/Icon=gtk-paste/" $PKG/usr/share/applications/parcellite.desktop
+  sed -i "s/Icon=parcellite/Icon=gtk-paste/" $PKG/etc/xdg/autostart/parcellite-startup.desktop
+
+  # Remove the unused icons
+  rm -rfv $PKG/usr/share/pixmaps/
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -66,7 +84,7 @@ 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 AUTHORS COPYING ChangeLog README TODO INSTALL \
+cp -a AUTHORS COPYING ChangeLog README TODO INSTALL NEWS \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/parcellite/parcellite.info b/desktop/parcellite/parcellite.info
index 59cb89d0d3d6..1ea1b190b1b6 100644
--- a/desktop/parcellite/parcellite.info
+++ b/desktop/parcellite/parcellite.info
@@ -1,10 +1,10 @@
 PRGNAM="parcellite"
-VERSION="0.9.2"
+VERSION="1.0.2rc2"
 HOMEPAGE="http://parcellite.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/parcellite/parcellite-0.9.2.tar.gz"
-MD5SUM="a650f6fe0fec96827b30ca3218a2b4df"
+DOWNLOAD="http://downloads.sourceforge.net/parcellite/parcellite-1.0.2rc2.tar.gz"
+MD5SUM="c1ade542f9b5e836af18773171e70e95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Phillip Warner"
 EMAIL="pc_warner@yahoo.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/desktop/parcellite/slack-desc b/desktop/parcellite/slack-desc
index d83eaa77828d..29adbd57fa19 100644
--- a/desktop/parcellite/slack-desc
+++ b/desktop/parcellite/slack-desc
@@ -7,9 +7,9 @@
 
           |-----handy-ruler-----------------------------------------------------|
 parcellite: parcellite (clipboard manager)
-parcellite: 
+parcellite:
 parcellite: Parcellite is a lightweight GTK+ clipboard manager.
-parcellite: 
+parcellite:
 parcellite: Homepage: http://parcellite.sourceforge.net
 parcellite:
 parcellite: