!16 I660NZ:fix nothing provides elfutils-extra on openEuler-20.03-LTS-SP3

From: @kuenking111 
Reviewed-by: @DXwangg, @jvmboy 
Signed-off-by: @DXwangg, @jvmboy
This commit is contained in:
openeuler-ci-bot 2022-12-26 06:44:45 +00:00 committed by Gitee
commit 4fe4d00204
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -781,7 +781,7 @@ Requires: tzdata-java >= 2015d
# 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 >= 3.9
Requires: copy-jdk-configs >= 3.3
OrderWithRequires: copy-jdk-configs
# for printing support
Requires: cups-libs
@ -885,7 +885,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 0
Release: 1
# 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
@ -981,7 +981,7 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
BuildRequires: elfutils-extra
#BuildRequires: elfutils-extra
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
BuildRequires: giflib-devel
@ -1597,12 +1597,7 @@ done
-- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
local posix = require "posix"
if (os.getenv("debug") == "true") then
debug = true;
print("cjc: in spec debug is on")
else
debug = false;
end
local debug=false
SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
@ -1631,9 +1626,8 @@ else
end
end
-- run content of included file with fake args
cjc = require "copy_jdk_configs.lua"
arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
cjc.mainProgram(arg)
require "copy_jdk_configs.lua"
%post
%{post_script %{nil}}
@ -1758,6 +1752,9 @@ cjc.mainProgram(arg)
%changelog
* Wed Dec 17 2022 kuenking111 <wangkun49@huawei.com> - 1:17.0.5.8-0.1
- fix rpm build failed
* Wed Oct 19 2022 kuenking111 <wangkun49@huawei.com> - 1:17.0.5.8-0.rolling
- modified add-version-txt.patch
- add jdk17.0.5-ga