From cc74d6d1b8dd4f27bc4c3815ca98dccbc9864649 Mon Sep 17 00:00:00 2001
From: Andrew Toskin <andrew@tosk.in>
Date: Jul 15 2020 03:22:56 +0000
Subject: Remove "BleachBit As Administrator": broken by default on Fedora


Upstream offers a .desktop entry (based on the inline catted PolicyKit
files here in the spec) for launching BleachBit with administrator
privileges. However, their current implementation requests the password
not for the invoking user with sudo access, but for the literal root
account -- which by default on Fedora is never actually set. Even if the
user manually sets a root password, the bleachbit-root executable only
works from the command line; the .desktop file silently launches and
then exits again without prompting for a password at all.

Unless or until the upstream developers figure out another solution
(discussed at <https://github.com/bleachbit/bleachbit/issues/950>),
I think Fedora users are better off just opening a terminal and doing
`sudo bleachbit` instead.

---

diff --git a/bleachbit.spec b/bleachbit.spec
index f7be8b9..c4ca9cb 100644
--- a/bleachbit.spec
+++ b/bleachbit.spec
@@ -20,7 +20,6 @@ BuildRequires: python3-rpm-macros
 
 Requires: python(abi) >= 3.0
 Requires: gtk3
-Requires: usermode
 Requires: python3-chardet
 Requires: python3-gobject
 
@@ -43,23 +42,6 @@ to make them run faster.
 %prep
 %setup -q
 
-# Upstream also creates this extra .desktop file, for running BleachBit as root, by copying the basic version instead of tracking a separate file in git.
-cp -p  ./org.bleachbit.BleachBit.desktop  ./org.bleachbit.BleachBit-root.desktop
-sed --regexp-extended 's/^Name=BleachBit$/Name=BleachBit as Administrator/g'  --in-place ./org.bleachbit.BleachBit-root.desktop
-sed --regexp-extended 's/^(.*Exec)=bleachbit$/\1=bleachbit-root/g'            --in-place ./org.bleachbit.BleachBit-root.desktop
-
-cat > ./bleachbit.pam <<EOF
-#%%PAM-1.0
-auth       include    config-util
-account    include    config-util
-session    include    config-util
-EOF
-
-cat > ./bleachbit.console <<EOF
-USER=root
-PROGRAM=%{_bindir}/bleachbit
-SESSION=true
-EOF
 
 # Disable update notifications, since package will be updated by DNF or Packagekit.
 sed 's/online_update_notification_enabled = True/online_update_notification_enabled = False/g'  --in-place ./bleachbit/__init__.py
@@ -69,6 +51,7 @@ find ./  -type f  -name '*.py'  -exec sed --regexp-extended '1s|^#! ?/usr/bin/en
 find ./  -type f  -name '*.py'  -exec sed --regexp-extended '1s|^#! ?/usr/bin/python[[:digit:][:punct:]]*$|#!%{_bindir}/python3|g' --in-place '{}' +
 
 
+
 %build
 %py3_build
 %make_build --directory ./po/
@@ -82,22 +65,18 @@ make delete_windows_files
 %make_install  PYTHON=%{__python3}  DESTDIR=%{buildroot}  prefix=%{_prefix}  INSTALL="%{_bindir}/install -Dp"
 %make_install --directory ./po/  PYTHON=%{__python3}  DESTDIR=%{buildroot}  prefix=%{_prefix}  INSTALL="%{_bindir}/install -Dp"
 
-mkdir -p %{buildroot}/%{_sysconfdir}/security/console.apps
-install -Dp  ./bleachbit.pam      %{buildroot}/%{_sysconfdir}/pam.d/bleachbit-root
-install -Dp  ./bleachbit.console  %{buildroot}/%{_sysconfdir}/security/console.apps/bleachbit-root
-mkdir -p %{buildroot}/%{_sbindir}
-ln --symbolic  %{_bindir}/consolehelper  %{buildroot}/%{_bindir}/bleachbit-root
-ln --symbolic  %{_bindir}/bleachbit      %{buildroot}/%{_sbindir}/bleachbit-root
-
-desktop-file-install --dir=%{buildroot}/%{_datadir}/applications/  org.bleachbit.BleachBit*.desktop
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications/  org.bleachbit.BleachBit.desktop
 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
+
 %find_lang %{name}
 
 
 
 %check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/org.bleachbit.BleachBit*.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.bleachbit.BleachBit.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit.BleachBit.metainfo.xml
 
 
@@ -110,15 +89,11 @@ update-desktop-database
 %files -f %{name}.lang
 %doc  README*  CONTRIBUTING.md
 %license COPYING
-%{_bindir}/bleachbit*
-%{_sbindir}/bleachbit*
+%{_bindir}/bleachbit
 %{_datadir}/bleachbit/
-%{_datadir}/applications/org.bleachbit.BleachBit*.desktop
+%{_datadir}/applications/org.bleachbit.BleachBit.desktop
 %{_metainfodir}/org.bleachbit.BleachBit.metainfo.xml
 %{_datadir}/pixmaps/bleachbit.png
-%{_datadir}/polkit-1/actions/org.bleachbit.policy
-%config(noreplace) %{_sysconfdir}/pam.d/bleachbit-root
-%config(noreplace) %{_sysconfdir}/security/console.apps/bleachbit-root