5 files changed, 16 insertions, 63 deletions
diff --git a/system/bleachbit/bleachbit.SlackBuild b/system/bleachbit/bleachbit.SlackBuild
index 35a5d7955af2e..93bd10672a59d 100644
--- a/system/bleachbit/bleachbit.SlackBuild
+++ b/system/bleachbit/bleachbit.SlackBuild
@@ -23,9 +23,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bleachbit
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.6.3}
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -39,25 +39,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
-# Ignore the Slackware package manager's directories
-# Thanks to Andrew Ziew upstream for the quick response
-patch -p1 < $CWD/patches/bleachbit-0.4.1-Unix.py.diff
+# Exclude the Windows-only cleaners from the package as per author's 
+# instructions.
+grep -l os=.windows. cleaners/*xml | xargs rm -f
 
-# Make a launcher using this debian patch
-patch -p1 < $CWD/patches/bleachbit-0.4.1-launcher.diff
-
-# Fix the icon in the .desktop file
-sed -i -e 's|Icon=bleachbit.png|Icon=bleachbit|g' bleachbit.desktop
-
-python setup.py install --root $PKG
-make -C po install DESTDIR=$PKG
-
-# Make the launcher executable by all
-chmod 755 $PKG/usr/bin/bleachbit
+make install DESTDIR=$PKG prefix=/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING PKG-INFO README doc/* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -69,4 +60,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/system/bleachbit/bleachbit.info b/system/bleachbit/bleachbit.info
index b0a735a4485e4..83e0591775f05 100644
--- a/system/bleachbit/bleachbit.info
+++ b/system/bleachbit/bleachbit.info
@@ -1,8 +1,10 @@
 PRGNAM="bleachbit"
-VERSION="0.4.1"
+VERSION="0.6.3"
 HOMEPAGE="http://bleachbit.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/bleachbit/bleachbit-0.4.1.tar.bz2"
-MD5SUM="b211c60a198ddf8023c7a460538bd031"
+DOWNLOAD="http://downloads.sourceforge.net/bleachbit/bleachbit-0.6.3.tar.bz2"
+MD5SUM="305963247e84d1a55247aa9fde7d4a17"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave <at> gmail {dot} com"
-APPROVED="dsomero,rworkman"
+APPROVED="dsomero"
diff --git a/system/bleachbit/patches/bleachbit-0.4.1-Unix.py.diff b/system/bleachbit/patches/bleachbit-0.4.1-Unix.py.diff
deleted file mode 100644
index e77e2ab025ea1..0000000000000
--- a/system/bleachbit/patches/bleachbit-0.4.1-Unix.py.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- trunk/bleachbit/Unix.py	2009/02/08 20:08:26	274
-+++ trunk/bleachbit/Unix.py	2009/05/08 02:27:54	346
-@@ -447,7 +447,9 @@
-     regex = '-[0-9]{8}$'
-     globpaths = ( '/var/log/*-*', '/var/log/*/*-*' )
-     for path in FileUtilities.globex(globpaths, regex):
--        yield path
-+        whitelist_re = '^/var/log/(removed_)?(packages|scripts)'
-+        if None == re.match(whitelist_re, path): # for Slackware, Launchpad #367575
-+            yield path
- 
- 
- def wine_to_linux_path(wineprefix, windows_pathname):
diff --git a/system/bleachbit/patches/bleachbit-0.4.1-launcher.diff b/system/bleachbit/patches/bleachbit-0.4.1-launcher.diff
deleted file mode 100644
index 8d10625e8a9b7..0000000000000
--- a/system/bleachbit/patches/bleachbit-0.4.1-launcher.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Implement and install a launcher to start the GUI.
-
-Index: bleachbit-0.2.1/bin/bleachbit
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ bleachbit-0.2.1/bin/bleachbit	2009-01-29 22:10:20.641192983 +0100
-@@ -0,0 +1,8 @@
-+#!/usr/bin/env python
-+
-+import bleachbit.GUI
-+import gtk
-+
-+if __name__ == '__main__':
-+    gui = bleachbit.GUI.GUI()
-+    gtk.main()
-Index: bleachbit-0.2.1/setup.py
-===================================================================
---- bleachbit-0.2.1.orig/setup.py	2009-01-29 22:10:13.625194708 +0100
-+++ bleachbit-0.2.1/setup.py	2009-01-29 22:10:20.641192983 +0100
-@@ -25,6 +25,7 @@
- data_files = []
- data_files.append(('/usr/share/applications', ['./bleachbit.desktop']))
- data_files.append(('/usr/share/pixmaps/', ['./bleachbit.png']))
-+data_files.append(('/usr/bin', ['bin/bleachbit']))
- 
- setup(name='bleachbit',
-       version='0.4.1',
diff --git a/system/bleachbit/slack-desc b/system/bleachbit/slack-desc
index 8fe431e13623c..c5ed4655986f4 100644
--- a/system/bleachbit/slack-desc
+++ b/system/bleachbit/slack-desc
@@ -16,4 +16,4 @@ bleachbit: wipes clean Adobe Reader, APT, Bash, Beagle, Chromium, Epiphany,
 bleachbit: Firefox, Flash, GIMP, Google Earth, Java, KDE, OpenOffice.org, Opera, 
 bleachbit: RealPlayer, Second Life viewer, Skype, VIM, XChat, Yum, and more.
 bleachbit: 
-bleachbit: http://bleachbit.sourceforge.net/
+bleachbit: Homepage: http://bleachbit.sourceforge.net/