From ae414fc2e6319e4065846c4c6ee963f9e140d499 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Wed, 12 Aug 2026 16:32:10 +0200 Subject: [PATCH 1/3] Fix pam and config file handling Looks like this was not done correctly during the recent build system migration, lets fix that. --- MANIFEST.in | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index bfb5bb0..98e1dd3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,3 +7,5 @@ recursive-include scripts * recursive-include po *.po *.pot Makefile recursive-include initial_setup *.py *.glade recursive-exclude modules *.pyc *.pyo +include data/10-initial-setup.conf +include pam/initial-setup diff --git a/pyproject.toml b/pyproject.toml index 8042c97..d7a462a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ Repository = "https://github.com/rhinstaller/initial-setup" issues = "https://github.com/rhinstaller/initial-setup/issues" [tool.setuptools.packages.find] -exclude = ["po*", "scripts*", "systemd*", "tests*"] +exclude = ["po*", "scripts*", "systemd*", "tests*", "data*", "pam*"] [tool.setuptools.package-data] "*" = ["*.glade"] From 40f17fb3b181aacec9dee036defa4f44a27d6a31 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Wed, 12 Aug 2026 17:10:01 +0200 Subject: [PATCH 2/3] Prevent Glade dependency from breaking ELN tests Only pull in the Glade build dependency where we can actually expect it to be available, --- initial-setup.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/initial-setup.spec b/initial-setup.spec index e415775..0bdff5b 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,5 +1,6 @@ # Enable X11 for RHEL 9 and older only %bcond x11 %[0%{?rhel} && 0%{?rhel} < 10] +%bcond glade %[%{undefined rhel} && %{undefined eln}] Name: initial-setup Summary: Initial system configuration utility @@ -23,7 +24,9 @@ BuildRequires: gettext BuildRequires: python3-devel BuildRequires: systemd-units BuildRequires: gtk3-devel +%if %{with glade} BuildRequires: glade-devel +%endif BuildRequires: intltool BuildRequires: make From f7e5bf93791c75e27be520fc6e1785223ed56d75 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Thu, 13 Aug 2026 15:12:59 +0200 Subject: [PATCH 3/3] Drop python-wheel dependecny Looks like this is no longer needed for a successful build and it breaking ELN, so let's drop it. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d7a462a..4b63b04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61.0", "wheel"] +requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project]