From 80ca331c51a042fba3f478bad6952dbe0f028427 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Jul 27 2015 13:08:56 +0000
Subject: Update to 1.8


---

diff --git a/.gitignore b/.gitignore
index a93d1df..413524a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ bleachbit-0.8.0.tar.lzma
 /bleachbit-1.3.tar.bz2
 /bleachbit-1.4.tar.bz2
 /bleachbit-1.6.tar.bz2
+/bleachbit-1.8.tar.bz2
diff --git a/bleachbit.spec b/bleachbit.spec
index 68636cb..7d614d8 100644
--- a/bleachbit.spec
+++ b/bleachbit.spec
@@ -1,10 +1,11 @@
 Name:           bleachbit
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Python utility to free disk space and improve privacy
 License:        GPLv3+
 URL:            http://bleachbit.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         https://github.com/az0/bleachbit/commit/d79cc0ca76999082860d635d6913c3fd0655c0a1.patch
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -20,14 +21,19 @@ shortcuts. It wipes clean the cache and history list of many common programs.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Disable update notifications or it will left collecting unemployment of 
 # yum/dnf and myself...
-sed -i -e '\@online_update_notification_enabled@s/^.*$/online_update_notification_enabled = False/g' bleachbit/Common.py
+sed -i -e '\@online_update_notification_enabled@s/^.*$/online_update_notification_enabled = False/g' \
+bleachbit/Common.py && egrep online_update_notification_enabled[[:space:]]=[[:space:]]False bleachbit/Common.py
 
 # Drop deprecated line in desktop file.
 sed -i '/Encoding/d' bleachbit.desktop
 
+# Drop env shebangs as files in %%_datadir usually don't need this.
+find bleachbit/ -type f -name '*.py' -exec sed -i '1{\@^#!/usr/bin/env python@d}' {} +
+
 %build
 make -C po local 
 %{__python2} setup.py build
@@ -35,9 +41,12 @@ make -C po local
 %install
 %make_install INSTALL="install -p" prefix=%{_prefix}
 
-# Drop shebangs as files in _datadir usually don't need this.
-sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/bleachbit/CLI.py
-sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/bleachbit/GUI.py
+# Drop cleaners for Microsoft Windows only.
+find %{buildroot}%{_datadir}/%{name}/cleaners/ -type f -name '*.xml' \
+-exec egrep -rl os.*windows {} + | xargs rm -fv
+
+# Correct shebang of bleachbit executable.
+sed -i 's|#!/usr/bin/env python|%{__python2}|' %{buildroot}%{_bindir}/bleachbit
 
 %find_lang %{name}
 
@@ -50,7 +59,8 @@ make -C cleaners tests
 desktop-file-validate %{buildroot}%{_datadir}/applications/bleachbit.desktop
 
 %files -f %{name}.lang
-%doc COPYING README
+%doc README*
+%license COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/
@@ -58,6 +68,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bleachbit.desktop
 %exclude %{_datadir}/%{name}/Windows.py*
 
 %changelog
+* Fri Jul 24 2015 Christopher Meng <rpm@cicku.me> - 1.8-1
+- Update to 1.8
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 8a5098b..fb0df95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10e12cd3896dcfee2c4e56c83850298d  bleachbit-1.6.tar.bz2
+433f9d655c366aac50ca2d5f9aa8b86d  bleachbit-1.8.tar.bz2