From 7165551fd769eb345d379e324897e1f407836241 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 17 Mar 2023 21:55:19 +0800 Subject: [PATCH 1/2] dist/redhat: enforce dependency on %{release} also s/%{version}/%{version}-%{release}/ in `Requires:` sections. this enforces the runtime dependencies of exactly the same releases between scylla packages. Fixes #13222 Signed-off-by: Kefu Chai --- dist/redhat/scylla.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/redhat/scylla.spec b/dist/redhat/scylla.spec index c62cb766cb..ed8f1c0190 100644 --- a/dist/redhat/scylla.spec +++ b/dist/redhat/scylla.spec @@ -7,7 +7,7 @@ Group: Applications/Databases License: AGPLv3 URL: http://www.scylladb.com/ Source0: %{reloc_pkg} -Requires: %{product}-server = %{version} %{product}-conf = %{version} %{product}-python3 = %{version} %{product}-kernel-conf = %{version} %{product}-jmx = %{version} %{product}-tools = %{version} %{product}-tools-core = %{version} %{product}-node-exporter = %{version} %{product}-cqlsh = %{version} +Requires: %{product}-server = %{version}-%{release} %{product}-conf = %{version}-%{release} %{product}-python3 = %{version}-%{release} %{product}-kernel-conf = %{version}-%{release} %{product}-jmx = %{version}-%{release} %{product}-tools = %{version}-%{release} %{product}-tools-core = %{version}-%{release} %{product}-node-exporter = %{version}-%{release} %{product}-cqlsh = %{version}-%{release} Obsoletes: scylla-server < 1.1 %global _debugsource_template %{nil} @@ -54,7 +54,7 @@ Group: Applications/Databases Summary: The Scylla database server License: AGPLv3 URL: http://www.scylladb.com/ -Requires: %{product}-conf = %{version} %{product}-python3 = %{version} +Requires: %{product}-conf = %{version}-%{release} %{product}-python3 = %{version}-%{release} Conflicts: abrt AutoReqProv: no From b11fd28a46502bbb5882ef4752a01b2c43a7d5cf Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 20 Mar 2023 20:48:22 +0800 Subject: [PATCH 2/2] dist/redhat: split Requires section into multiple lines for better readability Signed-off-by: Kefu Chai --- dist/redhat/scylla.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dist/redhat/scylla.spec b/dist/redhat/scylla.spec index ed8f1c0190..ffed6a83f9 100644 --- a/dist/redhat/scylla.spec +++ b/dist/redhat/scylla.spec @@ -7,7 +7,15 @@ Group: Applications/Databases License: AGPLv3 URL: http://www.scylladb.com/ Source0: %{reloc_pkg} -Requires: %{product}-server = %{version}-%{release} %{product}-conf = %{version}-%{release} %{product}-python3 = %{version}-%{release} %{product}-kernel-conf = %{version}-%{release} %{product}-jmx = %{version}-%{release} %{product}-tools = %{version}-%{release} %{product}-tools-core = %{version}-%{release} %{product}-node-exporter = %{version}-%{release} %{product}-cqlsh = %{version}-%{release} +Requires: %{product}-server = %{version}-%{release} +Requires: %{product}-conf = %{version}-%{release} +Requires: %{product}-python3 = %{version}-%{release} +Requires: %{product}-kernel-conf = %{version}-%{release} +Requires: %{product}-jmx = %{version}-%{release} +Requires: %{product}-tools = %{version}-%{release} +Requires: %{product}-tools-core = %{version}-%{release} +Requires: %{product}-node-exporter = %{version}-%{release} +Requires: %{product}-cqlsh = %{version}-%{release} Obsoletes: scylla-server < 1.1 %global _debugsource_template %{nil} @@ -54,7 +62,8 @@ Group: Applications/Databases Summary: The Scylla database server License: AGPLv3 URL: http://www.scylladb.com/ -Requires: %{product}-conf = %{version}-%{release} %{product}-python3 = %{version}-%{release} +Requires: %{product}-conf = %{version}-%{release} +Requires: %{product}-python3 = %{version}-%{release} Conflicts: abrt AutoReqProv: no