[rpms/bleachbit] rawhide: PR merge and test enablement

[rpms/bleachbit] rawhide: PR merge and test enablement

[Ali Erdinc Koroglu]

A new commit has been pushed.

Repo   : rpms/bleachbit
Branch : rawhide
Commit : ed50bb10ae56dcb9fdfb1e47cae9339628e75d57
Author : Ali Erdinc Koroglu <ali.koroglu@oss.qualcomm.com>
Date   : 2026-06-20T19:29:45+03:00
Stats  : +44/-37 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/bleachbit/c/ed50bb10ae56dcb9fdfb1e47cae9339628e75d57?branch=rawhide

Log:
PR merge and test enablement

---
diff --git a/bleachbit.spec b/bleachbit.spec
index 594643b..361568b 100644
--- a/bleachbit.spec
+++ b/bleachbit.spec
@@ -1,12 +1,6 @@
-# EPEL7 changes for Python and metainfodir
-%if 0%{?rhel} && 0%{?rhel} < 8
-%global __python %{__python3}
-%global _metainfodir %{_datadir}/metainfo
-%endif
-
 Name:		bleachbit
-Version:	4.6.0
-Release:	8%{?dist}
+Version:	6.0.0
+Release:	2%{?dist}
 Summary:	Remove sensitive data and free up disk space
 
 License:	GPL-3.0-or-later
@@ -24,18 +18,15 @@ BuildRequires:	gettext
 BuildRequires:	libappstream-glib
 BuildRequires:	make
 BuildRequires:	python3-devel
-%if 0%{?rhel}  &&  0%{?rhel} < 8
-BuildRequires:	python3-rpm-macros
-%endif
+BuildRequires:	python3-pytest
+BuildRequires:	python3-psutil
+BuildRequires:	python3-requests
 BuildRequires:	pkgconfig(systemd)
 
 Requires:	gtk3
 Requires:	python3-chardet
-%if 0%{?rhel}  &&  0%{?rhel} < 8
-Requires:	python36-gobject
-%else
 Requires:	python3-gobject
-%endif
+Requires:	python3-psutil
 
 
 %description
@@ -64,8 +55,6 @@ find ./bleachbit/  -type f  -iname '*.py'  -exec sed --regexp-extended '1s|^#! ?
 find ./  -type f  -iname '*.py'  -exec sed --regexp-extended '1s|^#! ?/usr/bin/env python3?$|#!%{_bindir}/python3|g' --in-place '{}' +
 find ./  -type f  -iname '*.py'  -exec sed --regexp-extended '1s|^#! ?/usr/bin/python[[:digit:][:punct:]]*$|#!%{_bindir}/python3|g' --in-place '{}' +
 
-# SafeConfigParser class removed from the configparser module in Python 3.12
-sed -i -e "s|SafeConfigParser|ConfigParser|" bleachbit/__init__.py
 
 %generate_buildrequires
 %pyproject_buildrequires -r
@@ -91,6 +80,11 @@ install -Dp org.bleachbit.BleachBit.metainfo.xml %{buildroot}/%{_metainfodir}/
 %check
 desktop-file-validate %{buildroot}/%{_datadir}/applications/org.bleachbit.BleachBit.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit.BleachBit.metainfo.xml
+%pytest -v \
+	--ignore=tests/TestWinapp.py \
+	--ignore=tests/TestWindows.py \
+	--ignore=tests/TestNetwork.py \
+	-k 'not (test_Chaff or test_have_models or test_clean_ini_kde or test_detect_encoding or test_run_external_nowait or test_expanduser or test_make_source or test_update_url or test_update_winapp2 or test_download_url_to_fn or test_get_ip_for_url)'
 
 
 %files -f %{name}.lang
@@ -104,6 +98,16 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit
 
 
 %changelog
+* Sat Jun 20 2026 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 6.0.0-2
+- Test enablement
+
+* Sun May 24 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 6.0.0-1
+- Update to v6.0.0
+
+* Mon Mar 02 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 5.1.0-1
+- Update to v5.1.0
+- Remove RHEL-7 specific parts of the spec
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/disable_policykit.patch b/disable_policykit.patch
index 628e45f..e81e21c 100644
--- a/disable_policykit.patch
+++ b/disable_policykit.patch
@@ -1,7 +1,9 @@
---- a/Makefile	2022-07-25 06:40:09.051418416 +0300
-+++ b/Makefile	2022-07-25 06:54:30.208675877 +0300
-@@ -75,8 +75,8 @@
- 	make -C po install DESTDIR=$(DESTDIR)
+diff -rU4 bleachbit-5.1.0--orig/Makefile bleachbit-5.1.0/Makefile
+--- bleachbit-5.1.0--orig/Makefile	2026-02-18 17:25:01.000000000 +0100
++++ bleachbit-5.1.0/Makefile	2026-03-02 22:20:33.366691611 +0100
+@@ -87,10 +87,10 @@
+ 	# translations
+ 	$(MAKE) -C po install DESTDIR=$(DESTDIR)
  
  	# PolicyKit
 -	mkdir -p $(DESTDIR)$(datadir)/polkit-1/actions
@@ -10,4 +12,5 @@
 +	#$(INSTALL_DATA) org.bleachbit.policy $(DESTDIR)$(datadir)/polkit-1/actions/
  
  lint:
- 	[ -x "$$(command -v pychecker)" ] ||  echo "WARNING: pychecker not found"
+ 	command -v pyflakes3 >/dev/null 2>&1 || echo "WARNING: Missing pyflakes3. APT users, try: sudo apt install pyflakes3"
+ 	command -v pylint >/dev/null 2>&1 || echo "WARNING: Missing pylint. APT users, try: sudo apt install pylint"

diff --git a/no_update.patch b/no_update.patch
index c2a56f5..8782512 100644
--- a/no_update.patch
+++ b/no_update.patch
@@ -1,14 +1,14 @@
-Description: Do not check for updates on the Internet, updates will be provided via repositories.
-Origin: Debian
-Forwarded: not-needed
---- a/bleachbit/Options.py
-+++ b/bleachbit/Options.py
-@@ -270,7 +270,7 @@
-         # set defaults
-         self.__set_default("auto_hide", True)
-         self.__set_default("check_beta", False)
--        self.__set_default("check_online_updates", True)
-+        self.__set_default("check_online_updates", False)
-         self.__set_default("dark_mode", True)
-         self.__set_default("debug", False)
-         self.__set_default("delete_confirmation", True)
+diff -rU4 bleachbit-5.1.0--orig/bleachbit/Options.py bleachbit-5.1.0/bleachbit/Options.py
+--- bleachbit-5.1.0--orig/bleachbit/Options.py	2026-02-18 17:25:01.000000000 +0100
++++ bleachbit-5.1.0/bleachbit/Options.py	2026-03-02 22:15:07.658146123 +0100
+@@ -42,9 +42,9 @@
+ OPTION_DEFAULTS = {
+     'auto_hide': {'value': True},
+     'auto_detect_lang': {'value': True},
+     'check_beta': {'value': False},
+-    'check_online_updates': {'value': True},
++    'check_online_updates': {'value': False},
+     'dark_mode': {'value': True},
+     'debug': {'value': False},
+     'delete_confirmation': {'value': True},
+     'expert_mode': {'value': False},

diff --git a/sources b/sources
index ac9c967..eb991c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bleachbit-4.6.0.tar.gz) = ca415c0c522e0a4104f63fdf7735a2891a48edaed429256a6690eda03db57d30435ed9c32f967705bd8e558ef9a6e66a89b1cbc741fdbe1064bf5df20a6005e3
+SHA512 (bleachbit-6.0.0.tar.gz) = dadf56ca33f0bb3489eba10523d465e605982443367a8885ddcfeec649ad130458c1d4a86af02a90d9d23b551aa1fedf741ccb0e39338372385e527a741c2087