From 38de5b518527d23a1857645968dfd674870925e9 Mon Sep 17 00:00:00 2001 From: lixiao Date: Sat, 24 Dec 2022 08:04:38 +0000 Subject: [PATCH 1/2] add weak dep of selinux-policy-targeted Signed-off-by: lixiao --- selinux-policy.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/selinux-policy.spec b/selinux-policy.spec index 6a629e9..8a044ff 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -12,7 +12,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.14.2 -Release: 75 +Release: 76 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -116,6 +116,7 @@ BuildRequires: python3 gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} Requires(post): /bin/awk /usr/bin/sha512sum Requires: rpm-plugin-selinux +Suggests: selinux-policy-targeted %description SELinux Base package for SELinux Reference Policy - modular. @@ -775,6 +776,9 @@ exit 0 %endif %changelog +* Fri Dec 23 2022 lixiao - 3.14.2-76 +- add weak dep of selinux-policy-targeted + * Thu Jun 17 2021 luhuaxin <1539327763@qq.com> - 3.14.2-75 - iptables.fc: Add missing legacy-restore and legacy-save entries -- Gitee From 78d7426f3e99a761d079969b2a498e74f7ff9528 Mon Sep 17 00:00:00 2001 From: lixiao Date: Sat, 24 Dec 2022 08:07:22 +0000 Subject: [PATCH 2/2] add the dependency between packages Signed-off-by: lixiao --- selinux-policy.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/selinux-policy.spec b/selinux-policy.spec index 8a044ff..0205642 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -12,7 +12,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.14.2 -Release: 76 +Release: 77 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -116,6 +116,8 @@ BuildRequires: python3 gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} Requires(post): /bin/awk /usr/bin/sha512sum Requires: rpm-plugin-selinux +Requires: selinux-policy-any = %{version}-%{release} +Provides: selinux-policy-base = %{version}-%{release} Suggests: selinux-policy-targeted %description @@ -489,6 +491,7 @@ exit 0 %package devel Summary: SELinux policy devel +Requires(pre): selinux-policy = %{version}-%{release} Requires: selinux-policy = %{version}-%{release} m4 checkpolicy >= %{CHECKPOLICYVER} /usr/bin/make Requires(post): policycoreutils-devel >= %{POLICYCOREUTILSVER} @@ -528,7 +531,7 @@ Summary: SELinux targeted base policy Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} coreutils selinux-policy = %{version}-%{release} Requires: selinux-policy = %{version}-%{release} -Provides: selinux-policy-base = %{version}-%{release} +Provides: selinux-policy-any = %{version}-%{release} Obsoletes: selinux-policy-targeted-sources < 2 Obsoletes: mod_fcgid-selinux <= %{version}-%{release} Obsoletes: cachefilesd-selinux <= 0.10-1 @@ -613,7 +616,7 @@ Requires(pre): coreutils selinux-policy = %{version}-%{release} Requires(post): policycoreutils-python-utils >= %{POLICYCOREUTILSVER} Requires: selinux-policy = %{version}-%{release} -Provides: selinux-policy-base = %{version}-%{release} +Provides: selinux-policy-any = %{version}-%{release} Conflicts: seedit Conflicts: container-selinux <= 1.9.0-9 @@ -712,9 +715,9 @@ exit 0 %package mls Summary: SELinux mls base policy Requires: policycoreutils-newrole >= %{POLICYCOREUTILSVER} setransd selinux-policy = %{version}-%{release} -Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} coreutils +Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} coreutils selinux-policy = %{version}-%{release} -Provides: selinux-policy-base = %{version}-%{release} +Provides: selinux-policy-any = %{version}-%{release} Obsoletes: selinux-policy-mls-sources < 2 Conflicts: seedit Conflicts: container-selinux <= 1.9.0-9 @@ -776,6 +779,9 @@ exit 0 %endif %changelog +* Sat Dec 24 2022 lixiao - 3.14.2-77 +- add the dependency between packages + * Fri Dec 23 2022 lixiao - 3.14.2-76 - add weak dep of selinux-policy-targeted -- Gitee