Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package containerized-data-importer for 
openSUSE:Factory checked in at 2021-07-05 22:22:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containerized-data-importer (Old)
 and      /work/SRC/openSUSE:Factory/.containerized-data-importer.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "containerized-data-importer"

Mon Jul  5 22:22:53 2021 rev:8 rq:904004 version:1.35.0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/containerized-data-importer/containerized-data-importer.changes
  2021-06-15 16:39:00.085866443 +0200
+++ 
/work/SRC/openSUSE:Factory/.containerized-data-importer.new.2625/containerized-data-importer.changes
        2021-07-05 22:23:19.365562797 +0200
@@ -1,0 +2,5 @@
+Wed Jun 30 05:36:37 UTC 2021 - Vasily Ulyanov <vasily.ulya...@suse.com>
+
+- Generate meta info for containers during rpm build
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ containerized-data-importer.spec ++++++
--- /var/tmp/diff_new_pack.jRmZVg/_old  2021-07-05 22:23:20.473554223 +0200
+++ /var/tmp/diff_new_pack.jRmZVg/_new  2021-07-05 22:23:20.477554192 +0200
@@ -133,20 +133,39 @@
 # If 'kubevirt_registry_path' is not specified, the standard publish location 
for
 # SLE and openSUSE-based containers is used.
 #
-%if "%{?kubevirt_registry_path}" == ""
-distro='%{?sle_version}:%{is_opensuse}'
+distro='%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}'
 case "${distro}" in
 150200:0)
-    reg_path='registry.suse.com/suse/sles/15.2' ;;
+    tagprefix=suse/sles/15.2
+    labelprefix=com.suse.kubevirt
+    registry=registry.suse.com
+    ;;
 150300:0)
-    reg_path='registry.suse.com/suse/sles/15.3' ;;
+    tagprefix=suse/sles/15.3
+    labelprefix=com.suse.kubevirt
+    registry=registry.suse.com
+    ;;
 *)
-    reg_path='registry.opensuse.org/kubevirt' ;;
+    tagprefix=kubevirt
+    labelprefix=org.opensuse.kubevirt
+    registry=registry.opensuse.org
+    ;;
 esac
+
+%if "%{?kubevirt_registry_path}" == ""
+    reg_path="${registry}/${tagprefix}"
 %else
-reg_path='%{kubevirt_registry_path}'
+    reg_path='%{kubevirt_registry_path}'
 %endif
 
+sed -i"" \
+    -e "s#_TAGPREFIX_#${tagprefix}#g" \
+    -e "s#_LABELPREFIX_#${labelprefix}#g" \
+    -e "s#_REGISTRY_#${registry}#g" \
+    -e "s#_PKG_VERSION_#%{version}#g" \
+    -e "s#_PKG_RELEASE_#%{release}#g" \
+    %{S:1}
+
 export GOPATH=%{_builddir}/go
 export GOFLAGS="-buildmode=pie -mod=vendor"
 env \

++++++ cdi_containers_meta ++++++
--- /var/tmp/diff_new_pack.jRmZVg/_old  2021-07-05 22:23:20.517553882 +0200
+++ /var/tmp/diff_new_pack.jRmZVg/_new  2021-07-05 22:23:20.517553882 +0200
@@ -1,23 +1,10 @@
 #!/bin/bash
 
-distro=$(rpm --eval '%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}')
-case "${distro}" in
-150200:0)
-    TAGPREFIX=suse/sles/15.2
-    LABELPREFIX=com.suse.kubevirt
-    REGISTRY=registry.suse.com
-    ;;
-150300:0)
-    TAGPREFIX=suse/sles/15.3
-    LABELPREFIX=com.suse.kubevirt
-    REGISTRY=registry.suse.com
-    ;;
-*)
-    TAGPREFIX=kubevirt
-    LABELPREFIX=org.opensuse.kubevirt
-    REGISTRY=registry.opensuse.org
-    ;;
-esac
+TAGPREFIX=_TAGPREFIX_
+LABELPREFIX=_LABELPREFIX_
+REGISTRY=_REGISTRY_
+PKG_VERSION=_PKG_VERSION_
+PKG_RELEASE=_PKG_RELEASE_
 
 if [ -n "${pkg}" ]; then
     if rpm -q ${pkg}; then

Reply via email to