Merge pull request 'fix(autopatch): Removed two obsolete replace actions from config-portable.yaml and config.yaml whose find strings no longer match the up' (#2) from agent-fix/a10-20260723-001345 into a10

Reviewed-on: #2

config-portable.yaml

@@ -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"

config.yaml

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