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 - [email protected]
+
+- Commit 229b3d2 by Fabian Vogt [email protected]
+ Abort build if changelog found but changelog-generator not available
+
+ Commit 8af17f6 by Fabian Vogt [email protected]
+ 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.000000000 +0100
+++ new/containment-rpm-docker-master/kiwi_post_run 2018-03-05
14:41:29.000000000 +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.000000000 +0100
+++ new/containment-rpm-docker-master/packaging/suse/make_spec.sh
2018-03-05 14:41:29.000000000 +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
