Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2017-05-22 18:09:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-CAASP"
Mon May 22 18:09:15 2017 rev:2 rq:496495 version:12.2.32
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2017-05-06 20:46:17.119186454 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2017-05-22 18:09:16.470868979 +0200
@@ -1,0 +2,14 @@
+Wed May 17 11:46:23 CEST 2017 - [email protected]
+
+- Added subvolume /home (bsc#1039237)
+- 12.2.31
+
+-------------------------------------------------------------------
+Tue May 9 13:47:02 UTC 2017 - [email protected]
+
+- Update the default pattern names (bsc#1038267)
+- Adapt the package to build also for openSUSE (added
+ control.Kubic.diff patch)
+- 12.2.31
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-CAASP-12.2.30.tar.bz2
New:
----
control.Kubic.diff
skelcd-control-CAASP-12.2.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-CAASP.spec ++++++
--- /var/tmp/diff_new_pack.FNKwqK/_old 2017-05-22 18:09:17.154772578 +0200
+++ /var/tmp/diff_new_pack.FNKwqK/_new 2017-05-22 18:09:17.158772014 +0200
@@ -42,7 +42,12 @@
# SLES specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
Requires: yast2-registration
+%if 0%{?is_susecaasp}
Requires: yast2-theme-SLE
+%else
+Requires: yast2-branding-openSUSE
+Requires: yast2-qt-branding-openSUSE
+%endif
# the CaaSP specific packages
Requires: yast2-caasp
@@ -97,13 +102,14 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 12.2.30
+Version: 12.2.32
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
+Patch: control.Kubic.diff
%description
The package contains the CaaSP control file needed for installation.
@@ -111,6 +117,9 @@
%prep
%setup -n %{name}-%{version}
+%if !0%{?is_susecaasp}
+%patch -p0
+%endif
%check
#
++++++ control.Kubic.diff ++++++
--- control/control.CAASP.xml
+++ control/control.CAASP.xml 2017/05/08 10:55:52
@@ -260,7 +260,6 @@
<id>dashboard_role</id>
<services config:type="list">
- <service><name>container-feeder</name></service>
<service><name>docker</name></service>
<service><name>etcd</name></service>
<service><name>kubelet</name></service>
@@ -271,7 +270,6 @@
<id>worker_role</id>
<services config:type="list">
- <service><name>container-feeder</name></service>
<service><name>salt-minion</name></service>
</services>
</system_role>
++++++ skelcd-control-CAASP-12.2.30.tar.bz2 ->
skelcd-control-CAASP-12.2.32.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-12.2.30/README.md
new/skelcd-control-CAASP-12.2.32/README.md
--- old/skelcd-control-CAASP-12.2.30/README.md 2017-05-05 08:48:00.974679700
+0200
+++ new/skelcd-control-CAASP-12.2.32/README.md 2017-05-19 10:08:30.666356636
+0200
@@ -4,7 +4,7 @@
[](https://travis-ci.org/yast/skelcd-control-CAASP)
-Installation control file for SUSE Linux Enterprise CaaSP product
+Installation control file for SUSE CaaS Platform product
See also the [documentation for the `control.xml` file][1].
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-12.2.30/control/control.CAASP.xml
new/skelcd-control-CAASP-12.2.32/control/control.CAASP.xml
--- old/skelcd-control-CAASP-12.2.30/control/control.CAASP.xml 2017-05-05
08:48:00.974679700 +0200
+++ new/skelcd-control-CAASP-12.2.32/control/control.CAASP.xml 2017-05-19
10:08:30.666356636 +0200
@@ -115,7 +115,7 @@
<!-- bnc#875350: Explicitly selecting these patterns by default -->
<!-- For a list of patterns, see
https://build.suse.de/package/view_file/SUSE:SLE-12-SP2:Update:Products:CASP10/patterns-caasp/patterns-caasp.spec?expand=1
-->
- <default_patterns>MicroOS Stack</default_patterns>
+ <default_patterns>SUSE-MicroOS SUSE-CaaSP-Stack</default_patterns>
<!-- bnc#876760: Explicitly selecting these (optional) patterns by
default if they exist -->
<optional_default_patterns>32bit</optional_default_patterns>
@@ -160,6 +160,9 @@
<path>tmp</path>
</subvolume>
<subvolume>
+ <path>home</path>
+ </subvolume>
+ <subvolume>
<path>cloud-init-config</path>
</subvolume>
<subvolume>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-12.2.30/package/control.Kubic.diff
new/skelcd-control-CAASP-12.2.32/package/control.Kubic.diff
--- old/skelcd-control-CAASP-12.2.30/package/control.Kubic.diff 1970-01-01
01:00:00.000000000 +0100
+++ new/skelcd-control-CAASP-12.2.32/package/control.Kubic.diff 2017-05-19
10:08:30.666356636 +0200
@@ -0,0 +1,18 @@
+--- control/control.CAASP.xml
++++ control/control.CAASP.xml 2017/05/08 10:55:52
+@@ -260,7 +260,6 @@
+ <id>dashboard_role</id>
+
+ <services config:type="list">
+- <service><name>container-feeder</name></service>
+ <service><name>docker</name></service>
+ <service><name>etcd</name></service>
+ <service><name>kubelet</name></service>
+@@ -271,7 +270,6 @@
+ <id>worker_role</id>
+
+ <services config:type="list">
+- <service><name>container-feeder</name></service>
+ <service><name>salt-minion</name></service>
+ </services>
+ </system_role>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-12.2.30/package/skelcd-control-CAASP.changes
new/skelcd-control-CAASP-12.2.32/package/skelcd-control-CAASP.changes
--- old/skelcd-control-CAASP-12.2.30/package/skelcd-control-CAASP.changes
2017-05-05 08:48:00.978679750 +0200
+++ new/skelcd-control-CAASP-12.2.32/package/skelcd-control-CAASP.changes
2017-05-19 10:08:30.666356636 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Wed May 17 11:46:23 CEST 2017 - [email protected]
+
+- Added subvolume /home (bsc#1039237)
+- 12.2.31
+
+-------------------------------------------------------------------
+Tue May 9 13:47:02 UTC 2017 - [email protected]
+
+- Update the default pattern names (bsc#1038267)
+- Adapt the package to build also for openSUSE (added
+ control.Kubic.diff patch)
+- 12.2.31
+
+-------------------------------------------------------------------
Thu May 4 08:47:25 UTC 2017 - [email protected]
- The package has been renamed from skelcd-control-CASP to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-12.2.30/package/skelcd-control-CAASP.spec
new/skelcd-control-CAASP-12.2.32/package/skelcd-control-CAASP.spec
--- old/skelcd-control-CAASP-12.2.30/package/skelcd-control-CAASP.spec
2017-05-05 08:48:00.978679750 +0200
+++ new/skelcd-control-CAASP-12.2.32/package/skelcd-control-CAASP.spec
2017-05-19 10:08:30.666356636 +0200
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-CAASP
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,12 @@
# SLES specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
Requires: yast2-registration
+%if 0%{?is_susecaasp}
Requires: yast2-theme-SLE
+%else
+Requires: yast2-branding-openSUSE
+Requires: yast2-qt-branding-openSUSE
+%endif
# the CaaSP specific packages
Requires: yast2-caasp
@@ -97,13 +102,14 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 12.2.30
+Version: 12.2.32
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
+Patch: control.Kubic.diff
%description
The package contains the CaaSP control file needed for installation.
@@ -111,6 +117,9 @@
%prep
%setup -n %{name}-%{version}
+%if !0%{?is_susecaasp}
+%patch -p0
+%endif
%check
#
