From e84bf9aed67a82b561aafe0bb713bb0136427a16 Mon Sep 17 00:00:00 2001 From: lixiao Date: Sat, 24 Dec 2022 07:57:23 +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 3a03d0b..952ba9b 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: 77 +Release: 78 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -120,6 +120,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. @@ -779,6 +780,9 @@ exit 0 %endif %changelog +* Fri Dec 23 2022 lixiao - 3.14.2-78 +- add weak dep of selinux-policy-targeted + * Sat Jun 25 2022 luhuaxin - 3.14.2-77 - allow httpd create files in /etc/httpd -- Gitee From 7635dabae48abb402752c298f0c2125129fcd9df Mon Sep 17 00:00:00 2001 From: lixiao Date: Sat, 24 Dec 2022 08:00:47 +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 952ba9b..114d6f7 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: 78 +Release: 79 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -120,6 +120,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 @@ -493,6 +495,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} @@ -532,7 +535,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 @@ -617,7 +620,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 @@ -716,9 +719,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 @@ -780,6 +783,9 @@ exit 0 %endif %changelog +* Sat Dec 24 2022 lixiao - 3.14.2-79 +- add the dependency between packages + * Fri Dec 23 2022 lixiao - 3.14.2-78 - add weak dep of selinux-policy-targeted -- Gitee