From d08afec66688e236c646bb1374020d04dfbc1f0b Mon Sep 17 00:00:00 2001
From: Audrey Toskin <audrey@tosk.in>
Date: Sep 13 2021 04:16:58 +0000
Subject: Bump to upstream version 4.4.0


BleachBit upstream merged in the .metainfo.xml file, and project lead
Andrew Ziem clarified the slight differences between a plain GitHub repo
archive and the official releases on SourceForge, discussed in the
linked GitHub issue 1088.

---

diff --git a/bleachbit.spec b/bleachbit.spec
index 8e18105..b575e98 100644
--- a/bleachbit.spec
+++ b/bleachbit.spec
@@ -1,8 +1,8 @@
 Name:       bleachbit
 Summary:    Remove sensitive data and free up disk space
 URL:        https://www.bleachbit.org/
-Version:    4.2.0
-Release:    4%{?dist}
+Version:    4.4.0
+Release:    1%{?dist}
 License:    GPLv3+ and MIT
 BuildArch:  noarch
 
@@ -10,8 +10,6 @@ BuildArch:  noarch
 Source0: https://downloads.sourceforge.net/project/bleachbit/bleachbit/%{version}/bleachbit-%{version}.tar.bz2
 Source1: https://downloads.sourceforge.net/project/bleachbit/bleachbit/%{version}/bleachbit-%{version}-sha256sum.txt.asc
 Source2: https://downloads.sourceforge.net/project/bleachbit/public_key/andrew2019.key
-# TODO: Remove this file when it merges on the next release -- <https://github.com/bleachbit/bleachbit/pull/1087>
-Source3: https://raw.githubusercontent.com/terrycloth/bleachbit/473f857716d9fa43c3978fc331840de2e9b4b51b/org.bleachbit.BleachBit.metainfo.xml
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -105,9 +103,7 @@ find ./  -type f  -iname '*.py'  -exec sed --regexp-extended '1s|^#! ?/usr/bin/p
 %make_install --directory ./po/  PYTHON=%{__python3}  prefix=%{_prefix}  INSTALL="%{_bindir}/install -Dp"
 
 desktop-file-install --dir=%{buildroot}/%{_datadir}/applications/  org.bleachbit.BleachBit.desktop
-# TODO: Go back to using the repo's original metainfo file when it merges on the next release.
-#install -Dp  org.bleachbit.BleachBit.metainfo.xml  %%{buildroot}/%%{_metainfodir}/
-install -Dp  %{SOURCE3}  %{buildroot}/%{_metainfodir}/
+install -Dp  org.bleachbit.BleachBit.metainfo.xml  %{buildroot}/%{_metainfodir}/
 
 # "BleachBit As Administrator" app launcher is broken, so we're not shipping any polkit files for now -- https://github.com/bleachbit/bleachbit/issues/950
 rm %{buildroot}/%{_datadir}/polkit-1/actions/org.bleachbit.policy
@@ -123,9 +119,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit
 
 
 %files -f %{name}.lang
-# TODO: Inconsistency about which doc files to include
-# https://github.com/bleachbit/bleachbit/issues/1088
-#%%doc  README*  doc/CONTRIBUTING.md
 %doc  README*
 %license COPYING
 %{_bindir}/bleachbit
@@ -139,6 +132,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit
 
 
 %changelog
+* Mon Sep 13 2021 Audrey Toskin <audrey@tosk.in> - 4.4.0-1
+- Bump to upstream version 4.4.0, with upstream enhancements documented
+  here: https://www.bleachbit.org/news/bleachbit-440
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
@@ -154,12 +151,3 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit
 
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Audrey Toskin <audrey@tosk.in> - 4.0.0-2
-- Finished unretired package.
-- GPG-verify source tarball.
-- Omit upstream's "BleachBit As Administrator" app launcher, since it's
-  broken on Fedora.
-
-* Wed Apr 22 2020 Audrey Toskin <audrey@tosk.in> - 4.0.0-1
-- Prepare to unretire package after upstream ported to GTK3 and Python3.