From e30e387ccfdc7d03e9dbbff6cbf746352b30d52d Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 13 Jan 2021 13:51:24 -0500
Subject: [PATCH] Split out -python-plugin subpackage

This will allow environments where Python is not desirable to still make
use of sudo, such as Fedora CoreOS and other variants which value
minimalism.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1909299
---
 sudo.spec | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/sudo.spec b/sudo.spec
index 4fde64f..78843a0 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,13 +1,14 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.9.3p1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ISC
 URL: https://www.sudo.ws
 Source0: %{url}/dist/%{name}-%{version}.tar.gz
 Source1: sudoers
 Requires: pam
 Recommends: vim-minimal
+Recommends: %{name}-python-plugin%{?_isa} = %{version}-%{release}
 Requires(post): coreutils
 
 BuildRequires: make
@@ -22,7 +23,6 @@ BuildRequires: libselinux-devel
 BuildRequires: sendmail
 BuildRequires: gettext
 BuildRequires: zlib-devel
-BuildRequires: python3-devel
 
 # don't strip
 Patch1: sudo-1.6.7p5-strip.patch
@@ -57,6 +57,15 @@ BuildRequires:  openssl-devel
 %{name}-logsrvd is a high-performance log server that accepts event and I/O logs from sudo.
 It can be used to implement centralized logging of sudo logs.
 
+%package        python-plugin
+Summary:        Python plugin for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildRequires:  python3-devel
+
+
+%description    python-plugin
+%{name}-python-plugin allows using sudo plugins written in Python.
+
 %prep
 %setup -q
 
@@ -182,7 +191,6 @@ EOF
 %attr(0644,root,root) %{_libexecdir}/sudo/sudoers.so
 %attr(0644,root,root) %{_libexecdir}/sudo/audit_json.so
 %attr(0644,root,root) %{_libexecdir}/sudo/group_file.so
-%attr(0644,root,root) %{_libexecdir}/sudo/python_plugin.so
 %attr(0644,root,root) %{_libexecdir}/sudo/sample_approval.so
 %attr(0644,root,root) %{_libexecdir}/sudo/system_group.so
 %attr(0644,root,root) %{_libexecdir}/sudo/libsudo_util.so.?.?.?
@@ -197,7 +205,6 @@ EOF
 %{_mandir}/man8/visudo.8*
 %{_mandir}/man1/cvtsudoers.1.gz
 %{_mandir}/man5/sudoers_timestamp.5.gz
-%{_mandir}/man8/sudo_plugin_python.8.gz
 %dir %{_pkgdocdir}/
 %{_pkgdocdir}/*
 %{!?_licensedir:%global license %%doc}
@@ -218,7 +225,15 @@ EOF
 %{_mandir}/man8/sudo_logsrvd.8.gz
 %{_mandir}/man8/sudo_sendlog.8.gz
 
+%files python-plugin
+%{_mandir}/man8/sudo_plugin_python.8.gz
+%attr(0644,root,root) %{_libexecdir}/sudo/python_plugin.so
+
 %changelog
+* Wed Jan 13 2021 Jonathan Lebon <jonathan@jlebon.com> - 1.9.3p1-2
+- split out Python modules into separate subpackage
+Resolves: rhbz#1909299
+
 * Mon Oct 05 2020 Radovan Sroka <rsroka@redhat.com> - 1.9.3p1-1
 - rebase to 1.9.3p1
 - enable python modules