From 5db48734d9c8fcf3bc1b21d50ae12f963da5452d Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Wed, 12 Feb 2025 18:21:29 +0100
Subject: [PATCH 1/3] Introduce rpmbuild tekton pipeline

Resolves: RHEL-79677
---
 .tekton/rhel-10-star-push.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tekton/rhel-10-star-push.yaml b/.tekton/rhel-10-star-push.yaml
index 23a068b..f618431 100644
--- a/.tekton/rhel-10-star-push.yaml
+++ b/.tekton/rhel-10-star-push.yaml
@@ -7,7 +7,7 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{ revision }}'
     build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "{{ target_branch }}"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: rhel-10-workload-apps-unsorted

From 984c0ae6ae1f6c562ae63f6fac3779b16fb3f9be Mon Sep 17 00:00:00 2001
From: "Chuang Cao(CC)" <chcao@redhat.com>
Date: Thu, 20 Mar 2025 17:29:11 +0800
Subject: [PATCH 2/3] Update the latest konflux app name to rhel-10

Resolves: RHEL-79677
---
 .tekton/rhel-10-star-pull-request.yaml | 4 ++--
 .tekton/rhel-10-star-push.yaml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.tekton/rhel-10-star-pull-request.yaml b/.tekton/rhel-10-star-pull-request.yaml
index 3c024ed..685186a 100644
--- a/.tekton/rhel-10-star-pull-request.yaml
+++ b/.tekton/rhel-10-star-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rhel-10-workload-apps-unsorted
+    appstudio.openshift.io/application: rhel-10
     appstudio.openshift.io/component: rhel-10-star
     pipelines.appstudio.openshift.io/type: build
   name: rhel-10-star-on-pull-request
@@ -19,7 +19,7 @@ metadata:
 spec:
   params:
     - name: application
-      value: rhel-10-workload-apps-unsorted
+      value: rhel-10
     - name: package-name
       value: star
     - name: git-url
diff --git a/.tekton/rhel-10-star-push.yaml b/.tekton/rhel-10-star-push.yaml
index f618431..e442b9e 100644
--- a/.tekton/rhel-10-star-push.yaml
+++ b/.tekton/rhel-10-star-push.yaml
@@ -10,7 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "{{ target_branch }}"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rhel-10-workload-apps-unsorted
+    appstudio.openshift.io/application: rhel-10
     appstudio.openshift.io/component: rhel-10-star
     pipelines.appstudio.openshift.io/type: build
   name: rhel-10-star-on-push
@@ -18,7 +18,7 @@ metadata:
 spec:
   params:
     - name: application
-      value: rhel-10-workload-apps-unsorted
+      value: rhel-10
     - name: package-name
       value: star
     - name: git-url

From 0a84dd83f1ad459d18194b877935e9521bc821af Mon Sep 17 00:00:00 2001
From: Michal Srb <michal@redhat.com>
Date: Thu, 27 Mar 2025 21:09:04 +0100
Subject: [PATCH 3/3] Rebuild for Konflux

Resolves: RHEL-84822
Signed-off-by: Michal Srb <michal@redhat.com>
---
 .tekton/rhel-10-star-push.yaml | 2 +-
 star.spec                      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.tekton/rhel-10-star-push.yaml b/.tekton/rhel-10-star-push.yaml
index e442b9e..b546d66 100644
--- a/.tekton/rhel-10-star-push.yaml
+++ b/.tekton/rhel-10-star-push.yaml
@@ -7,7 +7,7 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{ revision }}'
     build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "{{ target_branch }}"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "c10s"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: rhel-10
diff --git a/star.spec b/star.spec
index 73c5aac..a8bbd34 100644
--- a/star.spec
+++ b/star.spec
@@ -3,7 +3,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.6
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: CDDL-1.0 AND GPL-2.0-only
 URL: http://freecode.com/projects/star
 Source: https://downloads.sourceforge.net/s-tar/%{name}-%{version}.tar.bz2
@@ -202,6 +202,9 @@ fi
 %{_sysconfdir}/rmt
 
 %changelog
+* Thu Mar 27 2025 Michal Srb <michal@redhat.com> - 1.6-18
+- Rebuild for Konflux (Resolves: RHEL-84822)
+
 * Mon Feb 17 2025 Michal Srb <michal@redhat.com> - 1.6-17
 - rebuilt