fix(autopatch): auto-fix for java-25-openjdk on c10
Removed two obsolete replace actions from config-portable.yaml and config.yaml whose find strings no longer match the upstream c10 spec.
This commit is contained in:
parent
6e3efa2c88
commit
0d7c19c85a
@ -6,50 +6,8 @@ actions:
|
|||||||
- run_script:
|
- run_script:
|
||||||
- script: "replace_spec.sh"
|
- script: "replace_spec.sh"
|
||||||
cwd: "rpms"
|
cwd: "rpms"
|
||||||
- replace:
|
|
||||||
- target: "spec"
|
|
||||||
find: |
|
|
||||||
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
|
|
||||||
%define jreportablename() %{expand:%{jreportablenameimpl -- %%{1}}}
|
|
||||||
replace: |
|
|
||||||
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
|
|
||||||
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
|
|
||||||
# so we have to pass in "" but evaluate it, otherwise files record will include it
|
|
||||||
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
|
|
||||||
%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""})
|
|
||||||
%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""})
|
|
||||||
%define jreportablename() %{expand:%{jreportablenameimpl -- %%{1}}}
|
|
||||||
count: 1
|
|
||||||
- target: "spec"
|
|
||||||
find: |
|
|
||||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}
|
|
||||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
|
|
||||||
replace: |
|
|
||||||
%{_jvmdir}/%{jreportablearchiveForFiles}
|
|
||||||
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
|
|
||||||
count: 1
|
|
||||||
- target: "spec"
|
|
||||||
find: |
|
|
||||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
|
||||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum
|
|
||||||
replace: |
|
|
||||||
%{_jvmdir}/%{jdkportablearchiveForFiles}
|
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
|
||||||
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
|
|
||||||
count: 1
|
|
||||||
- target: "spec"
|
|
||||||
find: |
|
|
||||||
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}
|
|
||||||
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum
|
|
||||||
replace: |
|
|
||||||
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
|
|
||||||
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
|
|
||||||
count: 1
|
|
||||||
|
|
||||||
- changelog_entry:
|
- changelog_entry:
|
||||||
- name: "Andrew Lukoshko"
|
- name: "Andrew Lukoshko"
|
||||||
email: "alukoshko@almalinux.org"
|
email: "alukoshko@almalinux.org"
|
||||||
line:
|
line:
|
||||||
- "Portable build"
|
- "Portable build"
|
||||||
- "Fix portable archive macros for RPM 4.19"
|
|
||||||
|
|||||||
@ -13,11 +13,6 @@ actions:
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
count: 1
|
count: 1
|
||||||
- target: "spec"
|
|
||||||
find: "# %patch"
|
|
||||||
replace: "# %%patch"
|
|
||||||
count: -1
|
|
||||||
|
|
||||||
- modify_release:
|
- modify_release:
|
||||||
- suffix: ".alma.1"
|
- suffix: ".alma.1"
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user