autopatch/java-25-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request 'fix(autopatch): Removed obsolete replace actions from config-portable.yaml and config.yaml whose find targets no longer exist in the ups' (#1) from agent-fix/a10s-20260716-050411 into a10s

Browse Source 
Reviewed-on: #1
This commit is contained in:
eabdullin 2026-07-16 07:33:58 +00:00
commit 651ab8a239
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
config-portable.yaml
View File

@ -6,50 +6,8 @@ actions:
- run_script:
- script: "replace_spec.sh"
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:
- name: "Andrew Lukoshko"
email: "alukoshko@almalinux.org"
line:
- "Portable build"
- "Fix portable archive macros for RPM 4.19"

4
config.yaml
View File

@ -13,10 +13,6 @@ actions:
%endif
%endif
count: 1
- target: "spec"
find: "# %patch"
replace: "# %%patch"
count: -1
- modify_release:
- suffix: ".alma.1"