Hello community,
here is the log from the commit of package caasp-container-manifests for
openSUSE:Factory checked in at 2018-05-29 10:44:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
and /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-container-manifests"
Tue May 29 10:44:17 2018 rev:13 rq:612253 version:4.0.0+git_r285_beebd20
Changes:
--------
---
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
2018-05-22 17:02:43.454561314 +0200
+++
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
2018-05-29 10:44:19.961792734 +0200
@@ -1,0 +2,11 @@
+Fri May 25 13:03:44 UTC 2018 - [email protected]
+
+- Commit ce01435 by Jordi Massaguer Pla [email protected]
+ Do not requires container-feeder for SLE15
+
+ We will be using the SUSE Registry for SLE15
+
+ Signed-off-by: Jordi Massaguer Pla <[email protected]>
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caasp-container-manifests.spec ++++++
--- /var/tmp/diff_new_pack.3f1BF3/_old 2018-05-29 10:44:20.933756864 +0200
+++ /var/tmp/diff_new_pack.3f1BF3/_new 2018-05-29 10:44:20.937756716 +0200
@@ -29,14 +29,20 @@
%endif
Name: caasp-container-manifests
-Version: 4.0.0+git_r283_c4e427f
+Version: 4.0.0+git_r285_beebd20
Release: 0
Summary: Manifest file templates for containers on controller node
License: Apache-2.0
Group: System/Management
Url: https://github.com/kubic-project/caasp-container-manifests
Source: master.tar.gz
+
+# If it is not SLE15, require container-feeder
+# Otherwise, we are using the SUSE Registry
+%if 0%{?sle_version} != 150000
Requires: container-feeder
+%endif
+
# Require all the docker images
Requires: %{_base_image}-caasp-dex-image >= 2.0.0
Requires: %{_base_image}-dnsmasq-nanny-image >= 2.0.0
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/packaging/suse/make_spec.sh
new/caasp-container-manifests-master/packaging/suse/make_spec.sh
--- old/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-05-16 14:55:02.000000000 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-05-25 15:05:17.000000000 +0200
@@ -57,7 +57,13 @@
Url: https://github.com/kubic-project/caasp-container-manifests
Group: System/Management
Source: ${SAFE_BRANCH}.tar.gz
+
+# If it is not SLE15, require container-feeder
+# Otherwise, we are using the SUSE Registry
+%if 0%{?sle_version} != 150000
Requires: container-feeder
+%endif
+
# Require all the docker images
Requires: %{_base_image}-pause-image >= 2.0.0
Requires: %{_base_image}-mariadb-image >= 2.0.0
