diff --git a/.gitignore b/.gitignore index 8352360..aa86024 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dnsconfd-1.7.1.tar.gz /dnsconfd-1.7.2.tar.gz /dnsconfd-1.7.3.tar.gz +/dnsconfd-1.7.5.tar.gz diff --git a/dnsconfd.spec b/dnsconfd.spec index 15389b3..7ed9e6b 100644 --- a/dnsconfd.spec +++ b/dnsconfd.spec @@ -2,7 +2,7 @@ %global selinuxtype targeted Name: dnsconfd -Version: 1.7.3 +Version: 1.7.5 Release: 1%{?dist} Summary: Local DNS cache configuration daemon License: MIT @@ -11,8 +11,6 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source1: dnsconfd.sysusers BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-setuptools BuildRequires: python3-rpm-macros BuildRequires: python3-pip BuildRequires: systemd @@ -31,8 +29,8 @@ Requires: %{name}-cache Requires: polkit Suggests: %{name}-unbound Requires: (%{name}-unbound = %{version}-%{release} if %{name}-unbound) - -%?python_enable_dependency_generator +%generate_buildrequires +%pyproject_buildrequires %description Dnsconfd configures local DNS cache services. @@ -95,7 +93,7 @@ Dnsconfd dracut module %autosetup -n %{name}-%{version} %build -%py3_build +%pyproject_wheel %if %{defined fedora} && 0%{?fedora} < 40 || %{defined rhel} && 0%{?rhel} < 10 echo '/var/run/dnsconfd(/.*)? gen_context(system_u:object_r:dnsconfd_var_run_t,s0)' >> distribution/dnsconfd.fc @@ -112,7 +110,7 @@ pushd micro-dnsconfd popd %install -%py3_install +%pyproject_install mkdir -m 0755 -p %{buildroot}%{_datadir}/dbus-1/system.d/ mkdir -m 0755 -p %{buildroot}%{_datadir}/dbus-1/system-services/ mkdir -m 0755 -p %{buildroot}%{_sysconfdir}/unbound/conf.d/ @@ -242,6 +240,10 @@ fi %{_prefix}/lib/dracut/modules.d/99dnsconfd %changelog +* Thu Jan 08 2026 Tomas Korbar - 1.7.5-1 +- Rebase to 1.7.5 +- Resolves: RHEL-139901 + * Tue Jun 03 2025 Tomas Korbar - 1.7.3-1 - Rebase to 1.7.3 - Resolves: RHEL-94999 diff --git a/gating.yaml b/gating.yaml index c563504..2425a83 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,4 @@ product_versions: - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/upstream.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/distribution.functional} diff --git a/plans/upstream.fmf b/plans/distribution.fmf similarity index 67% rename from plans/upstream.fmf rename to plans/distribution.fmf index 44caf6e..e25792d 100644 --- a/plans/upstream.fmf +++ b/plans/distribution.fmf @@ -4,11 +4,6 @@ discover: how: fmf url: https://github.com/InfrastructureServices/dnsconfd.git filter: tag:distribution -prepare: - - name: package - order: 5 - how: install - package: - - dnsconfd + ref: 1.7.5 execute: how: tmt diff --git a/plans/imported.fmf b/plans/imported.fmf deleted file mode 100644 index d3d90c1..0000000 --- a/plans/imported.fmf +++ /dev/null @@ -1,29 +0,0 @@ -/distribution: - plan: - import: - url: https://github.com/InfrastructureServices/dnsconfd.git - name: /plans/distribution - -/integration: - plan: - import: - url: https://github.com/InfrastructureServices/dnsconfd.git - name: /plans/integration - -#/multihost: -# plan: -# import: -# url: https://github.com/InfrastructureServices/dnsconfd.git -# name: /plans/multihost - -#/multihost: -# plan: -# import: -# url: https://src.fedoraproject.org/tests/cups-filters.git -# name: /plans/multihost/multihost - -/unit: - plan: - import: - url: https://github.com/InfrastructureServices/dnsconfd.git - name: /plans/unit diff --git a/sources b/sources index f98c855..daedc06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnsconfd-1.7.3.tar.gz) = 91cd0a575236f66b8f9ecefc4f6ace447f4c4f7e365be98a430c820d462318de731ecec53f8a88e86a5b28e4fa33f1fc952c8a0fbace27593c27a386c5949c15 +SHA512 (dnsconfd-1.7.5.tar.gz) = 20f8fb42bfd36aaca73cb18fbd758bf2df8d63a5b444b722ff2834d2c86b0f94c893c08c7b998cb516786246dda7244b720a7631288edd0b81b7b416a534b568