Hello community,
here is the log from the commit of package containment-rpm-docker for
openSUSE:Factory checked in at 2018-07-06 10:43:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containment-rpm-docker (Old)
and /work/SRC/openSUSE:Factory/.containment-rpm-docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containment-rpm-docker"
Fri Jul 6 10:43:36 2018 rev:4 rq:620927 version:1.4.0+git_r86_c577fec
Changes:
--------
---
/work/SRC/openSUSE:Factory/containment-rpm-docker/containment-rpm-docker.changes
2018-04-06 17:51:33.187136164 +0200
+++
/work/SRC/openSUSE:Factory/.containment-rpm-docker.new/containment-rpm-docker.changes
2018-07-06 10:43:36.903139099 +0200
@@ -1,0 +2,34 @@
+Tue Jun 12 16:52:30 UTC 2018 - [email protected]
+
+- Commit 4532982 by Sergio Lindo Mansilla [email protected]
+ Fix plural on sentence
+
+
+-------------------------------------------------------------------
+Thu Jun 7 15:07:16 UTC 2018 - [email protected]
+
+- Commit 97bf8fc by Fabian Vogt [email protected]
+ Use uname -m for ARCH and also pass to rpmbuild
+
+ Otherwise we get into a mess where i386/i586/i686 are used in place of each
+ other.
+
+ Fixes #35
+
+
+-------------------------------------------------------------------
+Mon May 14 08:39:59 UTC 2018 - [email protected]
+
+- Commit fec546a by Jordi Massaguer Pla [email protected]
+ recommend changelog generator data instead of requiring it
+
+ Using the changelog generator data is not a hard requirement. You can build
+ rpms containing containers without creating the changelogs.
+
+ This way, it will create the changelogs only if the changelog-generator-data
+ package is available
+
+ Signed-off-by: Jordi Massaguer Pla <[email protected]>
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containment-rpm-docker.spec ++++++
--- /var/tmp/diff_new_pack.mhaw85/_old 2018-07-06 10:43:37.303138624 +0200
+++ /var/tmp/diff_new_pack.mhaw85/_new 2018-07-06 10:43:37.307138619 +0200
@@ -17,7 +17,7 @@
Name: containment-rpm-docker
-Version: 1.3.4+git_r80_62ea80a
+Version: 1.4.0+git_r86_c577fec
Release: 0
Summary: Wraps OBS/kiwi-built images in rpms
License: MIT
@@ -29,11 +29,11 @@
BuildArch: noarch
%if !0%{?is_opensuse}
%if 0%{?suse_version} >= 1230
-Requires: rubygem(changelog_generator)
+Recommends: rubygem(changelog_generator)
%else
-Requires: rubygem-changelog_generator
+Recommends: rubygem-changelog_generator
%endif
-Requires: changelog-generator-data
+Recommends: changelog-generator-data
%endif
Requires: libxml2-tools
# Conflicts with other packages that provide /usr/lib/build/kiwi_post_run
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containment-rpm-docker-master/README.md
new/containment-rpm-docker-master/README.md
--- old/containment-rpm-docker-master/README.md 2018-03-28 11:03:37.000000000
+0200
+++ new/containment-rpm-docker-master/README.md 2018-06-12 18:54:25.000000000
+0200
@@ -56,7 +56,7 @@
* A KIWI repository, this is called 'images' by default by the build service.
* A repository to build the containment-rpm-docker binary.
-If you plan to build a docker images for different version of SLE then you have
+If you plan to build docker images for different versions of SLE then you have
to make sure you build the containment rpm also for these targets. You have to
do that because the build host will have the same OS of the target (see
previous
section).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containment-rpm-docker-master/kiwi_post_run
new/containment-rpm-docker-master/kiwi_post_run
--- old/containment-rpm-docker-master/kiwi_post_run 2018-03-28
11:03:37.000000000 +0200
+++ new/containment-rpm-docker-master/kiwi_post_run 2018-06-12
18:54:25.000000000 +0200
@@ -32,7 +32,7 @@
echo "Generate metadata for spec file template"
-ARCH=$( rpm --eval '%{_arch}')
+ARCH="$(uname -m)"
# Parse KIWI config.xml to get docker images details
PKG_NAME=$( xmllint --xpath "string(//image/@name)" \
@@ -202,9 +202,9 @@
fi
if [ -z "$BUILD_DISTURL" ]; then
- rpmbuild -ba $BUILD_DIR/image.spec
+ rpmbuild --target $ARCH -ba $BUILD_DIR/image.spec
else
- rpmbuild -ba --define "disturl $BUILD_DISTURL" $BUILD_DIR/image.spec
+ rpmbuild --target $ARCH -ba --define "disturl $BUILD_DISTURL"
$BUILD_DIR/image.spec
fi
# required for the BS to find the rpm, because it is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containment-rpm-docker-master/packaging/suse/make_spec.sh
new/containment-rpm-docker-master/packaging/suse/make_spec.sh
--- old/containment-rpm-docker-master/packaging/suse/make_spec.sh
2018-03-28 11:03:37.000000000 +0200
+++ new/containment-rpm-docker-master/packaging/suse/make_spec.sh
2018-06-12 18:54:25.000000000 +0200
@@ -54,11 +54,11 @@
BuildArch: noarch
%if !0%{?is_opensuse}
%if 0%{?suse_version} >= 1230
-Requires: rubygem(changelog_generator)
+Recommends: rubygem(changelog_generator)
%else
-Requires: rubygem-changelog_generator
+Recommends: rubygem-changelog_generator
%endif
-Requires: changelog-generator-data
+Recommends: changelog-generator-data
%endif
Requires: libxml2-tools
# Conflicts with other packages that provide /usr/lib/build/kiwi_post_run
