Merge branch 'epel9' into epel8

Avoid using fragile regex and instead match on "%{version}-%{release}"
to do the substitutions.

This should make it both simpler (avoiding separate rhel7 conditional)
and more robust in case the build system sets a different dist tag than
what the regex expected.

java-latest-openjdk-portable.spec

@@ -338,7 +338,7 @@
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
-%global buildjdkver 22
+%global buildjdkver 21
 # We don't add any LTS designator for STS packages (Fedora and EPEL).
 # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
 %if 0%{?rhel} && !0%{?epel}
@@ -398,7 +398,7 @@
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        36
-%global rpmrelease      2
+%global rpmrelease      1
 #%%global tagsuffix     %%{nil}
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
@@ -1780,9 +1780,6 @@ done
 %endif
 
 %changelog
-* Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-2.rolling
-- bumped build jdk to 22
-
 * Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-1.rolling
 - updated to 22+36
 - tmp comment out of ea exit 17