From df7f3e4699e90d787ea0f43d2441b16a168c03ee8fbb33845fa5d8bbd05dccc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 23 Sep 2024 07:32:29 +0000
Subject: [PATCH] [info=2da3cbddf37aa96403bd0d9274a24060]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/gcc-12-image?expand=0&rev=105
---
 Dockerfile           | 8 ++++----
 _service             | 2 +-
 gcc-12-image.changes | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 003bd33..5d2c936 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,8 @@
 
 #!BuildTag: opensuse/bci/gcc:12
 #!BuildTag: opensuse/bci/gcc:12-%RELEASE%
-#!BuildTag: opensuse/bci/gcc:%%gcc_version%%
-#!BuildTag: opensuse/bci/gcc:%%gcc_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
@@ -29,7 +29,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends gcc12 gcc12-c++ make curl fi
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI GNU Compiler Collection"
 LABEL org.opencontainers.image.description="GNU Compiler Collection container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="12"
+LABEL org.opencontainers.image.version="%%gcc_minor_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
@@ -41,7 +41,7 @@ LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/gcc-12-image/README.md"
-ENV GCC_VERSION="%%gcc_version%%"
+ENV GCC_VERSION="%%gcc_minor_version%%"
 
 # symlink all versioned gcc & g++ binaries to unversioned
 # ones in /usr/local/bin so that plain gcc works
diff --git a/_service b/_service
index d54d408..691e666 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%gcc_version%%</param>
+    <param name="regex">%%gcc_minor_version%%</param>
     <param name="package">gcc12</param>
     <param name="parse-version">minor</param>
   </service>
diff --git a/gcc-12-image.changes b/gcc-12-image.changes
index 72265a4..76988cb 100644
--- a/gcc-12-image.changes
+++ b/gcc-12-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 23 07:17:50 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- use full version in container labels
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>