From d058f79e2a2014de358302949c16895aa2526a52c7cb1afb0af14f47f4816cee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Aug 2022 16:21:12 +0000 Subject: [PATCH 1/5] Accepting request 993829 from home:dimstar:Factory - Revert 'removal of upstream pokit action', but rather BuildRequire pkexec, which is what decides if the file is installed or not. OBS-URL: https://build.opensuse.org/request/show/993829 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:Apps/gparted?expand=0&rev=24 --- gparted.changes | 7 +++++++ gparted.spec | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gparted.changes b/gparted.changes index 19ee15f..6b71af6 100644 --- a/gparted.changes +++ b/gparted.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 8 16:15:42 UTC 2022 - Dominique Leuenberger + +- Revert 'removal of upstream pokit action', but rather + BuildRequire pkexec, which is what decides if the file is + installed or not. + ------------------------------------------------------------------- Sat Aug 6 13:00:33 UTC 2022 - Georg Pfuetzenreuter diff --git a/gparted.spec b/gparted.spec index c39c131..e0b8970 100644 --- a/gparted.spec +++ b/gparted.spec @@ -34,6 +34,9 @@ BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig BuildRequires: polkit +%if 0%{?suse_version} > 1500 +BuildRequires: pkexec +%endif BuildRequires: update-desktop-files BuildRequires: xfsprogs-devel BuildRequires: yelp-tools @@ -108,7 +111,7 @@ install -Dm0644 %{SOURCE98} %{buildroot}%{_datadir}/polkit-1/actions/org.opensus %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/polkit-1/actions/org.opensuse.policykit.%{name}.policy -#{_datadir}/polkit-1/actions/org.gnome.%%{name}.policy +%{_datadir}/polkit-1/actions/org.gnome.%%{name}.policy %{_datadir}/help/C/%{name}/index.docbook %{_datadir}/help/C/%{name}/figures/gparted_window.png %dir %{_datadir}/help/C/%{name} From f1dad932861f9b114e6a05b6c5275b252bef11f7fa83f9c2443b39c9ae62c653 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Aug 2022 06:07:47 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:Apps/gparted?expand=0&rev=25 --- gparted.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gparted.spec b/gparted.spec index e0b8970..545e79e 100644 --- a/gparted.spec +++ b/gparted.spec @@ -111,7 +111,7 @@ install -Dm0644 %{SOURCE98} %{buildroot}%{_datadir}/polkit-1/actions/org.opensus %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/polkit-1/actions/org.opensuse.policykit.%{name}.policy -%{_datadir}/polkit-1/actions/org.gnome.%%{name}.policy +%{_datadir}/polkit-1/actions/org.gnome.%{name}.policy %{_datadir}/help/C/%{name}/index.docbook %{_datadir}/help/C/%{name}/figures/gparted_window.png %dir %{_datadir}/help/C/%{name} From d1691daa95a270bea78c7dfa60f06ae8ece8fa04ac4d16362b3ae18e28a2c11e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Aug 2022 06:12:21 +0000 Subject: [PATCH 3/5] Accepting request 993906 from home:dimstar:Factory OBS-URL: https://build.opensuse.org/request/show/993906 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:Apps/gparted?expand=0&rev=26 --- gparted.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gparted.spec b/gparted.spec index 545e79e..9e5e9d0 100644 --- a/gparted.spec +++ b/gparted.spec @@ -94,6 +94,8 @@ export GKSUPROG="pkexec" %make_install install -Dm0644 %{SOURCE98} %{buildroot}%{_datadir}/polkit-1/actions/org.opensuse.policykit.%{name}.policy +# Here we remove upstream policy file since we have our own +rm %{buildroot}%{_datadir}/polkit-1/actions/org.gnome.%{name}.policy %suse_update_desktop_file %{name} %fdupes %{buildroot}%{_datadir} From d5d98646c27712f7f0be729abd9a78d03895a757f781bc0c4c88aa9abd97c4d6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Aug 2022 06:15:29 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:Apps/gparted?expand=0&rev=27 --- gparted.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gparted.spec b/gparted.spec index 9e5e9d0..b0e131f 100644 --- a/gparted.spec +++ b/gparted.spec @@ -113,7 +113,6 @@ rm %{buildroot}%{_datadir}/polkit-1/actions/org.gnome.%{name}.policy %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/polkit-1/actions/org.opensuse.policykit.%{name}.policy -%{_datadir}/polkit-1/actions/org.gnome.%{name}.policy %{_datadir}/help/C/%{name}/index.docbook %{_datadir}/help/C/%{name}/figures/gparted_window.png %dir %{_datadir}/help/C/%{name} From e1a0a98b3d918fe841794f67af8865a6bd09d55aa243ca1f2e2f6cd6540cc504 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Aug 2022 06:16:56 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:Apps/gparted?expand=0&rev=28 --- gparted.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gparted.spec b/gparted.spec index b0e131f..28b4d0d 100644 --- a/gparted.spec +++ b/gparted.spec @@ -113,6 +113,7 @@ rm %{buildroot}%{_datadir}/polkit-1/actions/org.gnome.%{name}.policy %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/polkit-1/actions/org.opensuse.policykit.%{name}.policy +#{_datadir}/polkit-1/actions/org.gnome.%%{name}.policy %{_datadir}/help/C/%{name}/index.docbook %{_datadir}/help/C/%{name}/figures/gparted_window.png %dir %{_datadir}/help/C/%{name}