Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2017-09-19 16:20:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-CAASP"
Tue Sep 19 16:20:41 2017 rev:4 rq:527294 version:15.0.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2017-09-12 20:12:32.266450772 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2017-09-19 16:20:43.721890555 +0200
@@ -1,0 +2,20 @@
+Tue Sep 19 08:13:49 UTC 2017 - [email protected]
+
+- Patch control.Kubic.xml using a XSL file, that's more robust
+ then a plain text diff (bsc#1059299)
+- 15.0.2
+
+-------------------------------------------------------------------
+Mon Sep 18 14:40:15 UTC 2017 - [email protected]
+
+- Adjust the install path for Kubic (openSUSE still uses the old
+ product builder in OBS)
+
+-------------------------------------------------------------------
+Mon Sep 18 12:35:24 UTC 2017 - [email protected]
+
+- Adjust control.Kubic.diff, remove non-existing admin-node-setup
+ service (bsc#1058749)
+- 15.0.1
+
+-------------------------------------------------------------------
@@ -51,0 +72,5 @@
+
+-------------------------------------------------------------------
+Wed May 24 14:51:45 CEST 2017 - [email protected]
+
+- /usr/lib/skelcd/CD1 instead of /CD1
Old:
----
control.Kubic.diff
skelcd-control-CAASP-15.0.0.tar.bz2
New:
----
skelcd-control-CAASP-15.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-CAASP.spec ++++++
--- /var/tmp/diff_new_pack.1NApsr/_old 2017-09-19 16:20:44.549773857 +0200
+++ /var/tmp/diff_new_pack.1NApsr/_new 2017-09-19 16:20:44.549773857 +0200
@@ -33,6 +33,12 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 3.1.13.12
+%if !0%{?is_susecaasp}
+# xsltproc - for building control.Kubic.xml from control.CAASP.xml
+BuildRequires: diffutils
+BuildRequires: libxslt-tools
+%endif
+
######################################################################
#
# Here is the list of Yast packages which are needed in the
@@ -103,14 +109,13 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.0.0
+Version: 15.0.2
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.
@@ -118,8 +123,14 @@
%prep
%setup -n %{name}-%{version}
+
%if !0%{?is_susecaasp}
-%patch -p0
+%build
+# build control.Kubic.xml from control.CAASP.xml
+make -C control control.Kubic.xml
+# display the changes (just for easier debugging)
+# don't fail, a difference is expected
+diff -u control/control.CAASP.xml control/control.Kubic.xml || :
%endif
%check
@@ -132,8 +143,13 @@
#
# Add control file
#
+%if 0%{?is_susecaasp}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/skelcd/CD1
+install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT/usr/lib/skelcd/CD1/control.xml
+%else
mkdir -p $RPM_BUILD_ROOT/CD1
-install -m 644 control/control.CAASP.xml $RPM_BUILD_ROOT/CD1/control.xml
+install -m 644 control/control.Kubic.xml $RPM_BUILD_ROOT/CD1/control.xml
+%endif
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -141,7 +157,12 @@
%files
%defattr(644,root,root,755)
+%if 0%{?is_susecaasp}
+%dir /usr/lib/skelcd
+/usr/lib/skelcd/CD1
+%else
/CD1
+%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
++++++ skelcd-control-CAASP-15.0.0.tar.bz2 ->
skelcd-control-CAASP-15.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.0/.travis.sh
new/skelcd-control-CAASP-15.0.2/.travis.sh
--- old/skelcd-control-CAASP-15.0.0/.travis.sh 2017-09-01 13:06:49.845038573
+0200
+++ new/skelcd-control-CAASP-15.0.2/.travis.sh 2017-09-19 14:07:13.032827172
+0200
@@ -2,7 +2,20 @@
set -e -x
-# validate the control file
+if [ "$BUILD_FLAVOR" == "kubic" ]; then
+ # build the file
+ make -C control control.Kubic.xml
+ # pretend we are running in an openSUSE Kubic build
+ echo "%is_susecaasp 0" >> ~/.rpmmacros
+elif [ "$BUILD_FLAVOR" == "caasp" ]; then
+ # pretend we are running in a SUSE CaaSP build
+ echo "%is_susecaasp 1" >> ~/.rpmmacros
+else
+ echo "Uknown BUILD_FLAVOR: $BUILD_FLAVOR"
+ exit 1
+fi
+
+# validate the control file(s)
make -C control check
# build the package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.0/.travis.yml
new/skelcd-control-CAASP-15.0.2/.travis.yml
--- old/skelcd-control-CAASP-15.0.0/.travis.yml 2017-09-01 13:06:49.845038573
+0200
+++ new/skelcd-control-CAASP-15.0.2/.travis.yml 2017-09-19 14:07:13.032827172
+0200
@@ -7,4 +7,7 @@
- docker build -t skelcd-control-caasp-image .
script:
- - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID"
skelcd-control-caasp-image ./.travis.sh
+ # the builds can run sequentially, the build in Docker is fast and Docker
isolates
+ # the containers (the second run has the very same initial image as the
first run)
+ - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e
BUILD_FLAVOR=caasp skelcd-control-caasp-image ./.travis.sh
+ - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e
BUILD_FLAVOR=kubic skelcd-control-caasp-image ./.travis.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.0/control/Makefile
new/skelcd-control-CAASP-15.0.2/control/Makefile
--- old/skelcd-control-CAASP-15.0.0/control/Makefile 2017-09-01
13:06:49.845038573 +0200
+++ new/skelcd-control-CAASP-15.0.2/control/Makefile 2017-09-19
14:07:13.032827172 +0200
@@ -3,3 +3,9 @@
check: /usr/share/YaST2/control/control.rng
xmllint --relaxng /usr/share/YaST2/control/control.rng --noout *.xml
+# generate the control.Kubic.xml file
+control.Kubic.xml: control.Kubic.xsl control.CAASP.xml
+ xsltproc control.Kubic.xsl control.CAASP.xml > control.Kubic.xml
+
+clean:
+ rm -f control.Kubic.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.0/control/control.Kubic.xsl
new/skelcd-control-CAASP-15.0.2/control/control.Kubic.xsl
--- old/skelcd-control-CAASP-15.0.0/control/control.Kubic.xsl 1970-01-01
01:00:00.000000000 +0100
+++ new/skelcd-control-CAASP-15.0.2/control/control.Kubic.xsl 2017-09-19
14:07:13.032827172 +0200
@@ -0,0 +1,25 @@
+<!--
+ Definition of the control.CAASP.xml -> control.Kubic.xml transformation.
+-->
+
+<xsl:stylesheet version="1.0" xmlns:n="http://www.suse.com/1.0/yast2ns";
xmlns:config="http://www.suse.com/1.0/configns";
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <!-- remove the "container-feeder" service from all roles (not available in
Kubic) -->
+ <xsl:template
match="n:system_role/n:services/n:service[n:name='container-feeder']"/>
+ <!-- a trick to remove the remaining empty line after node removal -->
+ <xsl:template
match="text()[following-sibling::node()[1][self::n:service[n:name='container-feeder']]]"
/>
+
+ <!-- remove the "admin-node-setup" service from all roles (not available in
Kubic) -->
+ <xsl:template
match="n:system_role/n:services/n:service[n:name='admin-node-setup']"/>
+ <!-- a trick to remove the remaining empty line after node removal -->
+ <xsl:template
match="text()[following-sibling::node()[1][self::n:service[n:name='admin-node-setup']]]"
/>
+
+</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.0/package/control.Kubic.diff
new/skelcd-control-CAASP-15.0.2/package/control.Kubic.diff
--- old/skelcd-control-CAASP-15.0.0/package/control.Kubic.diff 2017-09-01
13:06:49.845038573 +0200
+++ new/skelcd-control-CAASP-15.0.2/package/control.Kubic.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
---- control/control.CAASP.xml
-+++ control/control.CAASP.xml 2017/06/20 11:05:54
-@@ -264,7 +264,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>
-@@ -276,7 +275,6 @@
-
- <services config:type="list">
- <service><name>docker</name></service>
-- <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-15.0.0/package/skelcd-control-CAASP.changes
new/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.changes
--- old/skelcd-control-CAASP-15.0.0/package/skelcd-control-CAASP.changes
2017-09-01 13:06:49.845038573 +0200
+++ new/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.changes
2017-09-19 14:07:13.032827172 +0200
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Tue Sep 19 08:13:49 UTC 2017 - [email protected]
+
+- Patch control.Kubic.xml using a XSL file, that's more robust
+ then a plain text diff (bsc#1059299)
+- 15.0.2
+
+-------------------------------------------------------------------
+Mon Sep 18 14:40:15 UTC 2017 - [email protected]
+
+- Adjust the install path for Kubic (openSUSE still uses the old
+ product builder in OBS)
+
+-------------------------------------------------------------------
+Mon Sep 18 12:35:24 UTC 2017 - [email protected]
+
+- Adjust control.Kubic.diff, remove non-existing admin-node-setup
+ service (bsc#1058749)
+- 15.0.1
+
+-------------------------------------------------------------------
Fri Sep 1 10:36:24 UTC 2017 - [email protected]
- Added yast2-s390 dependency to fix failed disk activation
@@ -51,6 +71,11 @@
- 12.2.32
-------------------------------------------------------------------
+Wed May 24 14:51:45 CEST 2017 - [email protected]
+
+- /usr/lib/skelcd/CD1 instead of /CD1
+
+-------------------------------------------------------------------
Wed May 17 11:46:23 CEST 2017 - [email protected]
- Added subvolume /home (bsc#1039237)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.0/package/skelcd-control-CAASP.spec
new/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.spec
--- old/skelcd-control-CAASP-15.0.0/package/skelcd-control-CAASP.spec
2017-09-01 13:06:49.845038573 +0200
+++ new/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.spec
2017-09-19 14:07:13.032827172 +0200
@@ -33,6 +33,12 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 3.1.13.12
+%if !0%{?is_susecaasp}
+# xsltproc - for building control.Kubic.xml from control.CAASP.xml
+BuildRequires: libxslt-tools
+BuildRequires: diffutils
+%endif
+
######################################################################
#
# Here is the list of Yast packages which are needed in the
@@ -103,14 +109,13 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.0.0
+Version: 15.0.2
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.
@@ -118,8 +123,14 @@
%prep
%setup -n %{name}-%{version}
+
%if !0%{?is_susecaasp}
-%patch -p0
+%build
+# build control.Kubic.xml from control.CAASP.xml
+make -C control control.Kubic.xml
+# display the changes (just for easier debugging)
+# don't fail, a difference is expected
+diff -u control/control.CAASP.xml control/control.Kubic.xml || :
%endif
%check
@@ -132,8 +143,13 @@
#
# Add control file
#
+%if 0%{?is_susecaasp}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/skelcd/CD1
+install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT/usr/lib/skelcd/CD1/control.xml
+%else
mkdir -p $RPM_BUILD_ROOT/CD1
-install -m 644 control/control.CAASP.xml $RPM_BUILD_ROOT/CD1/control.xml
+install -m 644 control/control.Kubic.xml $RPM_BUILD_ROOT/CD1/control.xml
+%endif
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -141,7 +157,12 @@
%files
%defattr(644,root,root,755)
+%if 0%{?is_susecaasp}
+%dir /usr/lib/skelcd
+/usr/lib/skelcd/CD1
+%else
/CD1
+%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
