From 88245d3a22f3526cacdf39497350395b2a386e7f820e2393554c53aa6d86e567 Mon Sep 17 00:00:00 2001
From: dbw7 <danial.bekhit@suse.com>
Date: Fri, 18 Apr 2025 02:02:34 -0400
Subject: [PATCH 1/4] changes for EIB v1.1.1-rc0

---
 edge-image-builder-image/Dockerfile        | 8 ++++----
 edge-image-builder/_service                | 2 +-
 edge-image-builder/edge-image-builder.spec | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile
index 764c3c0..92fbfc2 100644
--- a/edge-image-builder-image/Dockerfile
+++ b/edge-image-builder-image/Dockerfile
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0.1
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1-rc0
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1-rc0-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION
@@ -15,11 +15,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image"
 LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.1.0.1"
+LABEL org.opencontainers.image.version="1.1.1-rc0"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.0.1-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.1-rc0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
diff --git a/edge-image-builder/_service b/edge-image-builder/_service
index 63b3ac7..79d3a3b 100644
--- a/edge-image-builder/_service
+++ b/edge-image-builder/_service
@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v1.1.0</param>
+    <param name="revision">v1.1.1-rc0</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>
diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec
index e1c1f77..6bea6de 100644
--- a/edge-image-builder/edge-image-builder.spec
+++ b/edge-image-builder/edge-image-builder.spec
@@ -17,7 +17,7 @@
 
 
 Name:           edge-image-builder
-Version:        1.1.0
+Version:        1.1.1-rc0
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0
-- 
2.49.0


From 9367f1c5512d2f306dcbf5fbdfe705a8a436d1bea1bd9e8e22cc4e94c7b9c1fd Mon Sep 17 00:00:00 2001
From: dbw7 <danial.bekhit@suse.com>
Date: Tue, 29 Apr 2025 10:39:41 -0400
Subject: [PATCH 2/4] modify '-' to '~'

---
 edge-image-builder/_service                | 1 +
 edge-image-builder/edge-image-builder.spec | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/edge-image-builder/_service b/edge-image-builder/_service
index 79d3a3b..656bef0 100644
--- a/edge-image-builder/_service
+++ b/edge-image-builder/_service
@@ -5,6 +5,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="revision">v1.1.1-rc0</param>
+    <param name="version">1.1.1~rc0</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>
diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec
index 6bea6de..2e2b903 100644
--- a/edge-image-builder/edge-image-builder.spec
+++ b/edge-image-builder/edge-image-builder.spec
@@ -17,7 +17,7 @@
 
 
 Name:           edge-image-builder
-Version:        1.1.1-rc0
+Version:        1.1.1~rc0
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0
-- 
2.49.0


From bcd1166491e683509284b9a8f9bfbd02b9a8ca21b997251721c949f8ade0ab1c Mon Sep 17 00:00:00 2001
From: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>
Date: Wed, 30 Apr 2025 09:53:15 +0200
Subject: [PATCH 3/4] Fix the _service file to use the defined pre-release
 version

---
 edge-image-builder/_service | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/edge-image-builder/_service b/edge-image-builder/_service
index 656bef0..f9d0c30 100644
--- a/edge-image-builder/_service
+++ b/edge-image-builder/_service
@@ -1,11 +1,13 @@
 <services>
   <service name="obs_scm">
     <param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
-    <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="revision">v1.1.1-rc0</param>
+    <!-- Uncomment and set this For Pre-Release Version -->
     <param name="version">1.1.1~rc0</param>
+    <!-- Uncomment and this for regular version -->
+    <!-- <param name="versionformat">@PARENT_TAG@</param> -->
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>
-- 
2.49.0


From 2831063a774af301a3421845ce5ab3c4480eae3ed95d14d100709ae7e6d7dfe8 Mon Sep 17 00:00:00 2001
From: dbw7 <danial.bekhit@suse.com>
Date: Thu, 1 May 2025 11:58:21 -0400
Subject: [PATCH 4/4] changes for final release

---
 edge-image-builder-image/Dockerfile        | 8 ++++----
 edge-image-builder/_service                | 6 +++---
 edge-image-builder/edge-image-builder.spec | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile
index 92fbfc2..d7234a0 100644
--- a/edge-image-builder-image/Dockerfile
+++ b/edge-image-builder-image/Dockerfile
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1-rc0
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1-rc0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION
@@ -15,11 +15,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image"
 LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.1.1-rc0"
+LABEL org.opencontainers.image.version="1.1.1"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.1-rc0-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.1-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
diff --git a/edge-image-builder/_service b/edge-image-builder/_service
index f9d0c30..4951b00 100644
--- a/edge-image-builder/_service
+++ b/edge-image-builder/_service
@@ -3,11 +3,11 @@
     <param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v1.1.1-rc0</param>
+    <param name="revision">v1.1.1</param>
     <!-- Uncomment and set this For Pre-Release Version -->
-    <param name="version">1.1.1~rc0</param>
+    <!-- <param name="version">1.1.1~rc0</param> -->
     <!-- Uncomment and this for regular version -->
-    <!-- <param name="versionformat">@PARENT_TAG@</param> -->
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>
diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec
index 2e2b903..16faa40 100644
--- a/edge-image-builder/edge-image-builder.spec
+++ b/edge-image-builder/edge-image-builder.spec
@@ -17,7 +17,7 @@
 
 
 Name:           edge-image-builder
-Version:        1.1.1~rc0
+Version:        1.1.1
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0
-- 
2.49.0