diff --git a/CHANGES.txt b/CHANGES.txt index 8d4631974a..221701a12d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Merged from 4.0: * Migrate Python optparse to argparse (CASSANDRA-17914) Merged from 3.11: Merged from 3.0: + * Fix Requires for Java for RPM package (CASSANDRA-18751) * Fix CQLSH online help topic link (CASSANDRA-17534) * Remove unused suppressions (CASSANDRA-18724) diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec index 7431c1cd8e..e51df7cdf4 100644 --- a/redhat/cassandra.spec +++ b/redhat/cassandra.spec @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{relname}root-%(%{__id_u} -n) BuildRequires: ant >= 1.9 BuildRequires: ant-junit >= 1.9 -Requires: (jre-1.8.0 or jre-11) +Requires: (java-1.8.0-headless or java-11-headless) Requires: python(abi) >= 3.6 Requires: procps-ng >= 3.3 Requires(pre): user(cassandra) diff --git a/redhat/noboolean/cassandra.spec b/redhat/noboolean/cassandra.spec index a3abaa6ece..b404463e25 100644 --- a/redhat/noboolean/cassandra.spec +++ b/redhat/noboolean/cassandra.spec @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{relname}root-%(%{__id_u} -n) BuildRequires: ant >= 1.9 BuildRequires: ant-junit >= 1.9 -Requires: jre >= 1.8.0 +Requires: java-1.8.0-headless Requires: python(abi) >= 3.6 Requires: procps-ng >= 3.3 Requires(pre): user(cassandra)