commit containment-rpm-docker for openSUSE:Factory

2018-07-06 Thread root 
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 - containers-bui...@suse.de
+
+- Commit 4532982 by Sergio Lindo Mansilla slindomansi...@suse.com
+ Fix plural on sentence
+
+
+---
+Thu Jun  7 15:07:16 UTC 2018 - containers-bui...@suse.de
+
+- Commit 97bf8fc by Fabian Vogt fv...@suse.com
+ 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 - containers-bugow...@suse.de
+
+- Commit fec546a by Jordi Massaguer Pla jmassaguer...@suse.de
+ 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 
+
+
+---



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.0 
+0200
+++ new/containment-rpm-docker-master/README.md 2018-06-12 18:54:25.0 
+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.0 +0200
+++ new/containment-rpm-docker-master/kiwi_post_run 2018-06-12 
18:54:25.0 +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

commit containment-rpm-docker for openSUSE:Factory

2018-04-06 Thread root 
Hello community,

here is the log from the commit of package containment-rpm-docker for 
openSUSE:Factory checked in at 2018-04-06 17:49:11

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 Apr  6 17:49:11 2018 rev:3 rq:593916 version:1.3.4+git_r80_62ea80a

Changes:

--- 
/work/SRC/openSUSE:Factory/containment-rpm-docker/containment-rpm-docker.changes
2018-03-09 10:46:11.327558209 +0100
+++ 
/work/SRC/openSUSE:Factory/.containment-rpm-docker.new/containment-rpm-docker.changes
   2018-04-06 17:51:33.187136164 +0200
@@ -1,0 +2,9 @@
+Wed Mar 28 09:03:30 UTC 2018 - containers-bugow...@suse.de
+
+- Commit c2e30cc by David Cassany dcass...@suse.com
+ Make local builds possible
+ 
+ This commit makes local OBS builds of images wrapped in RPMs possible.
+
+
+---



Other differences:
--
++ containment-rpm-docker.spec ++
--- /var/tmp/diff_new_pack.722eb7/_old  2018-04-06 17:51:34.283096541 +0200
+++ /var/tmp/diff_new_pack.722eb7/_new  2018-04-06 17:51:34.283096541 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   containment-rpm-docker
-Version:1.3.4+git_r78_fa6af2c
+Version:1.3.4+git_r80_62ea80a
 Release:0
 Summary:Wraps OBS/kiwi-built images in rpms
 License:MIT

++ master.tar.gz ++
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-05 
14:41:29.0 +0100
+++ new/containment-rpm-docker-master/kiwi_post_run 2018-03-28 
11:03:37.0 +0200
@@ -15,7 +15,7 @@
 BUILD_DISTURL=
 
 # To get BUILD_DISTURL
-. /.buildenv
+test -f /.buildenv && . /.buildenv
 
 cd $IMAGE_DIR
 
@@ -82,7 +82,12 @@
 
 NAME="${CONTAINER_NAME}-image"
 VERSION="${PKG_VERSION}"
-RELEASE=$(expr match "$PACKAGES" '.*-Build\(.*\).packages')
+RELEASE=$(echo "$PACKAGES" | sed 's/.*-Build\(.*\).packages/\1/')
+
+if [ -z "$RELEASE" ]; then
+echo "Could not parse release number, setting it to zero"
+RELEASE=0
+fi
 
 # For some time our images where named -docker-image,
 # now they have been renamed to -image.

commit containment-rpm-docker for openSUSE:Factory

2018-03-09 Thread root 
Hello community,

here is the log from the commit of package containment-rpm-docker for 
openSUSE:Factory checked in at 2018-03-09 10:46:02

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 Mar  9 10:46:02 2018 rev:2 rq:584405 version:1.3.4+git_r78_fa6af2c

Changes:

--- 
/work/SRC/openSUSE:Factory/containment-rpm-docker/containment-rpm-docker.changes
2018-02-06 17:10:28.188187897 +0100
+++ 
/work/SRC/openSUSE:Factory/.containment-rpm-docker.new/containment-rpm-docker.changes
   2018-03-09 10:46:11.327558209 +0100
@@ -1,0 +2,14 @@
+Mon Mar  5 13:41:32 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 229b3d2 by Fabian Vogt fv...@suse.com
+ Abort build if changelog found but changelog-generator not available
+ 
+ Commit 8af17f6 by Fabian Vogt fab...@ritter-vogt.de
+ Make changelog-generator optional for openSUSE
+ 
+ Fixes #31
+
+ feature#openSUSE_Kubic
+
+
+---



Other differences:
--
++ containment-rpm-docker.spec ++
--- /var/tmp/diff_new_pack.pbG1Nu/_old  2018-03-09 10:46:12.035532709 +0100
+++ /var/tmp/diff_new_pack.pbG1Nu/_new  2018-03-09 10:46:12.039532565 +0100
@@ -15,25 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Name:   containment-rpm-docker
-Version:1.3.4+git_r75_7dd7cf2
+Version:1.3.4+git_r78_fa6af2c
 Release:0
-License:MIT
 Summary:Wraps OBS/kiwi-built images in rpms
-Url:https://github.com/SUSE/containment-rpm-docker
+License:MIT
 Group:  System/Management
+Url:https://github.com/SUSE/containment-rpm-docker
 Source: master.tar.gz
 BuildRequires:  filesystem
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
+%if !0%{?is_opensuse}
 %if 0%{?suse_version} >= 1230
 Requires:   rubygem(changelog_generator)
 %else
 Requires:   rubygem-changelog_generator
 %endif
 Requires:   changelog-generator-data
+%endif
 Requires:   libxml2-tools
 # Conflicts with other packages that provide /usr/lib/build/kiwi_post_run
 Conflicts:  infos-creator-rpm

++ master.tar.gz ++
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-02-02 
10:38:02.0 +0100
+++ new/containment-rpm-docker-master/kiwi_post_run 2018-03-05 
14:41:29.0 +0100
@@ -147,6 +147,11 @@
 
 if [ -e $PACKAGES_FILENAME ];then
 if [ -e $CHANGELOG_FILENAME ];then
+if ! type changelog-generator &>/dev/null;then
+echo "Fatal: changelog found but 'changelog-generator' not 
installed!"
+exit 1
+fi
+
 changelog-generator --new-packages $PACKAGES \
   --old-packages $PACKAGES_FILENAME \
   --changelog $CHANGELOG_FILENAME > $BUILD_DIR/image.changes
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-02-02 10:38:02.0 +0100
+++ new/containment-rpm-docker-master/packaging/suse/make_spec.sh   
2018-03-05 14:41:29.0 +0100
@@ -52,12 +52,14 @@
 BuildRequires:  filesystem
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
+%if !0%{?is_opensuse}
 %if 0%{?suse_version} >= 1230
 Requires:   rubygem(changelog_generator)
 %else
 Requires:   rubygem-changelog_generator
 %endif
 Requires:   changelog-generator-data
+%endif
 Requires:   libxml2-tools
 # Conflicts with other packages that provide /usr/lib/build/kiwi_post_run
 Conflicts:  infos-creator-rpm

commit containment-rpm-docker for openSUSE:Factory

2018-02-06 Thread root 
Hello community,

here is the log from the commit of package containment-rpm-docker for 
openSUSE:Factory checked in at 2018-02-06 17:10:27

Comparing /work/SRC/openSUSE:Factory/containment-rpm-docker (Old)
 and  /work/SRC/openSUSE:Factory/.containment-rpm-docker.new (New)


Package is "containment-rpm-docker"

Tue Feb  6 17:10:27 2018 rev:1 rq:571941 version:1.3.4+git_r75_7dd7cf2

Changes:

New Changes file:

--- /dev/null   2018-01-05 12:14:39.755488130 +0100
+++ 
/work/SRC/openSUSE:Factory/.containment-rpm-docker.new/containment-rpm-docker.changes
   2018-02-06 17:10:28.188187897 +0100
@@ -0,0 +1,275 @@
+---
+Fri Feb  2 09:36:51 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 1956b4f by Jordi Massaguer Pla jmassaguer...@suse.de
+ Add conflicts with other packages that provide the same hook
+ /usr/lib/build/kiwi_post_run
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---
+Mon Jan 15 18:18:50 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 56cf72d by David Cassany dcass...@suse.com
+ Exit if no tag defined
+ 
+ This commit exits the kiwi_post_run hook script in case the config.xml file
+ does not include any tag specification.
+
+
+---
+Wed Nov  8 15:23:17 UTC 2017 - containers-bugow...@suse.de
+
+- Commit c3c1362 by Flavio Castelli fcaste...@suse.com
+ Obsolete packages with older naming scheme [bsc#1066653]
+ 
+ Ensure the packages that followed the older naming scheme get replaced by the
+ new ones.
+ 
+ Signed-off-by: Flavio Castelli 
+
+
+---
+Wed Sep  6 13:56:34 UTC 2017 - containers-bugow...@suse.de
+
+- Commit 66d6869 by David Cassany dcass...@suse.com
+ This commit removed the word 'docker' from the package name
+
+
+---
+Fri Sep  1 18:09:33 UTC 2017 - containers-bugow...@suse.de
+
+- Commit 055de6e by Jordi Massaguer Pla jmassaguer...@suse.de
+ Use IBS build number to distinguish releases
+ 
+ This solves a number of problems around updating images within IBS, and
+ delivering those as updates.
+ 
+ This is a rebase from https://github.com/SUSE/containment-rpm-docker/pull/24
+ 
+ Which Kiall started
+
+
+---
+Mon Aug 28 16:18:27 UTC 2017 - containers-bugow...@suse.de
+
+- Commit 055de6e by Jordi Massaguer Pla jmassaguer...@suse.de
+ Use IBS build number to distinguish releases
+ 
+ This solves a number of problems around updating images within IBS, and
+ delivering those as updates.
+ 
+ This is a rebase from https://github.com/SUSE/containment-rpm-docker/pull/24
+ 
+ Which Kiall started
+
+
+---
+Wed Aug 23 17:10:03 UTC 2017 - containers-bugow...@suse.de
+
+- Commit 1a6b95f by Kiall Mac Innes ki...@macinnes.ie
+ Add a tagfile, a mechanism to determine the latest image
+ 
+ Sometimes, using a ":latest" tag is not enough, for example, when you need to
+ inform Kubernetes that it should perform a rolling upgrade to the new tag.
+ 
+ By adding a file which contains the most specific tag for a given image, we
+ can have downstream tools use this to determine the tag that matches the
+ currently installed RPM.
+
+
+---
+Mon Aug  7 05:57:04 UTC 2017 - containers-bugow...@suse.de
+
+- Commit 01528cd by David Cassany dcass...@suse.com
+ Add DISTURL in RPM metadata, fixes bsc#1052030
+ 
+ With this commit kiwi_post_run script reads the '/.build/build.data' file
+ from the build service environment in order to get the $DISTURL environment
+ variable and set the DISTURL value in the rpm.
+
+
+---
+Fri Jul 28 12:40:54 UTC 2017 - containers-bugow...@suse.de
+
+- Commit 593eaf5 by Maximilian Meister mmeis...@suse.de
+ make branch safe by transforming slashes to dashes
+ 
+ Signed-off-by: Maximilian Meister 
+ 
+ Commit 2ba6987 by Maximilian Meister mmeis...@suse.de
+ packaging: make branch configurable
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---
+Fri Jun 30 09:05:29 UTC 2017 - containers-bugow...@suse.de
+
+- Commit d0c508a by David Cassany dcass...@suse.com
+ Remove tag from the package name
+ 
+ Now the image tag can be updated without creating a different rpm package for
+ each update.
+ 
+ This commit fixes bsc#1046378.
+
+
+---
+Tue Jun 13 08:52:54 UTC 2017 - containers-bugow...@suse.de
+
+- Commit b094d74 by Jordi Massaguer Pla jmassaguer...@suse