Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package containment-rpm for openSUSE:Factory
checked in at 2023-09-21 22:14:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containment-rpm (Old)
and /work/SRC/openSUSE:Factory/.containment-rpm.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containment-rpm"
Thu Sep 21 22:14:00 2023 rev:2 rq:1112561 version:2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/containment-rpm/containment-rpm.changes
2023-04-04 21:28:02.067786364 +0200
+++
/work/SRC/openSUSE:Factory/.containment-rpm.new.1770/containment-rpm.changes
2023-09-21 22:14:59.655327494 +0200
@@ -1,0 +2,6 @@
+Wed Sep 20 12:31:30 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 2.0.1:
+ * More robust handling of tags
+
+-------------------------------------------------------------------
Old:
----
v2.0.0.tar.gz
New:
----
v2.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containment-rpm.spec ++++++
--- /var/tmp/diff_new_pack.DgnNCL/_old 2023-09-21 22:15:00.883372063 +0200
+++ /var/tmp/diff_new_pack.DgnNCL/_new 2023-09-21 22:15:00.883372063 +0200
@@ -17,7 +17,7 @@
Name: containment-rpm
-Version: 2.0.0
+Version: 2.0.1
Release: 0
Summary: Wraps OBS docker/kiwi-built images in rpms
License: MIT
++++++ v2.0.0.tar.gz -> v2.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containment-rpm-2.0.0/container_post_run
new/containment-rpm-2.0.1/container_post_run
--- old/containment-rpm-2.0.0/container_post_run 2023-04-04
19:33:22.000000000 +0200
+++ new/containment-rpm-2.0.1/container_post_run 2023-09-20
13:27:17.000000000 +0200
@@ -47,6 +47,8 @@
PKG_VERSION=$( cat $IMAGE_DIR/*.containerinfo | jq -r '.version')
PKG_RELEASE=$( cat $IMAGE_DIR/*.containerinfo | jq -r '.release')
SUFFIX=".tar"
+CONTAINER_TAGS=$(cat $IMAGE_DIR/*.containerinfo | jq -r '.tags' | tr '\n' ' '
| sed -e 's,"[^"]*:,",g')
+CONTAINER_TAG=$(cat $IMAGE_DIR/*.containerinfo | jq -r '.tags[0]' | sed -e
's,.*:,,g;s,",,g' )
if [ -d $TOPDIR/KIWI ]; then
# Parse KIWI config.xml to get docker images details
@@ -61,13 +63,12 @@
SUFFIX=".docker${SUFFIX}"
fi
else
- PKG_NAME=$(echo $IMAGE | sed "s/-$PKG_VERSION.$ARCH-$PKG_RELEASE.*//g")
+ PKG_NAME=$(echo $IMAGE | sed "s@-$CONTAINER_TAG.$ARCH-$PKG_RELEASE.*@@g")
# only usable on kiwi build
CONTAINER_RAW="$PKG_NAME"
- PREFIX="${PKG_NAME}-${PKG_VERSION}.${ARCH}-${PKG_RELEASE}"
+ PREFIX="${PKG_NAME}-${CONTAINER_TAG}.${ARCH}-${PKG_RELEASE}"
fi
-CONTAINER_TAG=$( cat $IMAGE_DIR/*.containerinfo | jq -r '.tags[0]' )
-CONTAINER_NAME=$(echo $CONTAINER_RAW | sed 's/\//-/' )
+CONTAINER_NAME=$(echo $CONTAINER_RAW | sed 's@\/@-@' )
shopt -s nullglob
@@ -133,7 +134,7 @@
{
"image": {
"name": "$CONTAINER_RAW",
- "tags": [ "$CONTAINER_TAG", "${CONTAINER_TAG}-${RELEASE}", "latest" ],
+ "tags": $CONTAINER_TAGS,
"file": "$IMAGE"
}
}
@@ -141,7 +142,7 @@
# Generate tagfile for automation to determine the latest, most specific, tag
for
# the currently installed RPM
-cat $IMAGE_DIR/*.containerinfo | jq -r '.tags[0]' > $TAGFILE
+echo $CONTAINER_TAG > $TAGFILE
# Keep __SLE_VERSION__ in there for backwards compatiblity
# with older spec file templates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containment-rpm-2.0.0/packaging/suse/containment-rpm-docker.spec
new/containment-rpm-2.0.1/packaging/suse/containment-rpm-docker.spec
--- old/containment-rpm-2.0.0/packaging/suse/containment-rpm-docker.spec
2023-04-04 19:33:22.000000000 +0200
+++ new/containment-rpm-2.0.1/packaging/suse/containment-rpm-docker.spec
1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-#
-# spec file for package containment-rpm
-#
-# Copyright (c) 2023 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-Name: containment-rpm
-Version: 2.0.0
-Release: 0
-License: MIT
-Summary: Wraps OBS docker/kiwi-built images in rpms
-Url: https://github.com/SUSE/containment-rpm-docker
-Group: System/Management
-Source: %{name}-%{version}.tar.bz2
-Source1: image.spec.in
-Source2: container_post_run
-BuildRequires: filesystem
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-# disabled for now, not used for public cloud purpose
-%if 0
-%if 0%{?suse_version} >= 1230
-Requires: rubygem(changelog_generator)
-%else
-Requires: rubygem-changelog_generator
-%endif
-Requires: changelog-generator-data
-Requires: libxml2-tools
-%endif
-Requires: jq
-Requires: libxml2-tools
-
-%description
-OBS container_post_run hook to wrap a kiwi or docker image in an rpm package.
-
-This package should be required by the Build Service project's meta
-prjconf, so that the container_post_run hook is present in the container image
-and gets executed at the end of the image build. It will then build
-an rpm which contains the newly-produced image from kiwi/docker (using
-image.spec.in), and place the rpm in the correct location that it
-becomes an additional build artefact.
-
-%prep
-%setup -q
-
-%build
-
-%install
-mkdir -p %{buildroot}/usr/lib/build/post_build.d
-install -m 644 %{SOURCE1} %{buildroot}/usr/lib/build/
-install -m 755 %{SOURCE2} %{buildroot}/usr/lib/build/post_build.d/
-
-%files
-%defattr(-,root,root)
-%dir /usr/lib/build/post_build.d
-/usr/lib/build/post_build.d/*_post_run
-/usr/lib/build/image.spec.in
-
-%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containment-rpm-2.0.0/packaging/suse/containment-rpm.spec
new/containment-rpm-2.0.1/packaging/suse/containment-rpm.spec
--- old/containment-rpm-2.0.0/packaging/suse/containment-rpm.spec
1970-01-01 01:00:00.000000000 +0100
+++ new/containment-rpm-2.0.1/packaging/suse/containment-rpm.spec
2023-09-20 13:27:17.000000000 +0200
@@ -0,0 +1,67 @@
+#
+# spec file for package containment-rpm
+#
+# Copyright (c) 2023 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name: containment-rpm
+Version: 2.0.0
+Release: 0
+Summary: Wraps OBS docker/kiwi-built images in rpms
+License: MIT
+Group: System/Management
+URL: https://github.com/SUSE/containment-rpm-docker
+Source:
https://github.com/SUSE/containment-rpm/archive/refs/tags/v%{version}.tar.gz
+BuildRequires: filesystem
+Requires: jq
+Requires: libxml2-tools
+BuildArch: noarch
+# disabled for now, not used for public cloud purpose
+%if 0
+Requires: changelog-generator-data
+Requires: libxml2-tools
+%if 0%{?suse_version} >= 1230
+Requires: rubygem(changelog_generator)
+%else
+Requires: rubygem-changelog_generator
+%endif
+%endif
+
+%description
+OBS container_post_run hook to wrap a kiwi or docker image in an rpm package.
+
+This package should be required by the Build Service project's meta
+prjconf, so that the container_post_run hook is present in the container image
+and gets executed at the end of the image build. It will then build
+an rpm which contains the newly-produced image from kiwi/docker (using
+image.spec.in), and place the rpm in the correct location that it
+becomes an additional build artefact.
+
+%prep
+%setup -q
+
+%build
+
+%install
+mkdir -p %{buildroot}%{_prefix}/lib/build/post_build.d
+install -m 644 image.spec.in %{buildroot}%{_prefix}/lib/build/
+install -m 755 container_post_run
%{buildroot}%{_prefix}/lib/build/post_build.d/
+
+%files
+%dir %{_prefix}/lib/build/post_build.d
+%{_prefix}/lib/build/post_build.d/*_post_run
+%{_prefix}/lib/build/image.spec.in
+
+%changelog
