From a1fd6f7739d1e06a331653b6a6c1db873f3d3587 Mon Sep 17 00:00:00 2001 From: Renbo Date: Mon, 19 Aug 2024 17:39:45 +0800 Subject: [PATCH 1/2] update to setup-2.12.2-11.src.rpm Signed-off-by: Renbo --- setup.spec | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/setup.spec b/setup.spec index aad30a2..e6a2e4d 100644 --- a/setup.spec +++ b/setup.spec @@ -1,9 +1,7 @@ -%define anolis_release .0.1 - Summary: A set of system configuration and setup files Name: setup Version: 2.12.2 -Release: 9%{anolis_release}%{?dist} +Release: 11%{?dist} License: Public Domain Group: System Environment/Base URL: https://pagure.io/setup/ @@ -29,14 +27,6 @@ Patch9: setup-2.12.2-set-lang-as-env-var.patch The setup package contains a set of important system configuration and setup files, such as passwd, group, and profile. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %setup -q @@ -103,6 +93,7 @@ end %files %license COPYING +%doc uidgid %verify(not md5 size mtime) %config(noreplace) /etc/passwd %verify(not md5 size mtime) %config(noreplace) /etc/group %verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/shadow @@ -134,12 +125,13 @@ end %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab /etc/dnf/protected.d/%{name}.conf -%files doc -%doc uidgid - %changelog -* Thu May 25 2023 Xiaoping Liu - 2.12.2-9.0.1 -- Add doc sub package +* Wed Feb 14 2024 Martin Osvald - 2.12.2-11 +- Reverting the last change to fix dependency loop (RHEL-25020) + +* Mon Nov 27 2023 Lumír Balhar - 2.12.2-10 +- Suggest python36 to increase its priority over other Pythons +Resolves: RHEL-17397 * Mon Nov 28 2022 Martin Osvald - 2.12.2-9 - Add missing %patch macro -- Gitee From 63867ff307997991bfa86c69e6a22846ac0e01bc Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Sun, 17 Jul 2022 15:47:34 +0800 Subject: [PATCH 2/2] add doc sub package --- setup.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/setup.spec b/setup.spec index e6a2e4d..6bd246d 100644 --- a/setup.spec +++ b/setup.spec @@ -1,7 +1,9 @@ +%define anolis_release .0.1 + Summary: A set of system configuration and setup files Name: setup Version: 2.12.2 -Release: 11%{?dist} +Release: 11%{anolis_release}%{?dist} License: Public Domain Group: System Environment/Base URL: https://pagure.io/setup/ @@ -27,6 +29,14 @@ Patch9: setup-2.12.2-set-lang-as-env-var.patch The setup package contains a set of important system configuration and setup files, such as passwd, group, and profile. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %setup -q @@ -93,7 +103,6 @@ end %files %license COPYING -%doc uidgid %verify(not md5 size mtime) %config(noreplace) /etc/passwd %verify(not md5 size mtime) %config(noreplace) /etc/group %verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/shadow @@ -125,7 +134,13 @@ end %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab /etc/dnf/protected.d/%{name}.conf +%files doc +%doc uidgid + %changelog +* Mon Aug 19 2024 Xiaoping Liu - 2.12.2-11.0.1 +- Add doc sub package + * Wed Feb 14 2024 Martin Osvald - 2.12.2-11 - Reverting the last change to fix dependency loop (RHEL-25020) -- Gitee