diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index b51ff460afbf1366a611fb61d199b78894682530..6b3a7f0d910aaa69a67dc8c1503c4c07db53f78a 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -829,7 +829,7 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION} # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression -Requires: copy-jdk-configs >= 4.0 +Requires: copy-jdk-configs >= 3.9 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1379,6 +1379,7 @@ BuildRequires: unzip BuildRequires: openssl-devel #BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: javapackages-filesystem BuildRequires: tzdata-java >= 2015d # Earlier versions have a bug in tree vectorization on PPC @@ -2392,7 +2393,7 @@ done -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all local posix = require "posix" -local debug = false; +local debug = false SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -2420,7 +2421,8 @@ else return end end -arg = nil; + +arg = nil ; cjc = require "copy_jdk_configs.lua" args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} cjc.mainProgram(args) @@ -2560,9 +2562,6 @@ cjc.mainProgram(args) %endif %changelog -* Wed Nov 8 2023 kuenking111 - 1:1.8.0.392-b08.3 -- fix copy_jdk_configs bad arguments #1 to gsub got nil - * Mon Oct 30 2023 kuenking111 - 1:1.8.0.392-b08.2 - remove add-8142508-To-bring-j.u.z.ZipFile-s-native-implemen.patch - remove add-8226530-ZipFile-reads-wrong-entry-size-from-ZIP6.patch