Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2018-11-10 16:48:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-CAASP"
Sat Nov 10 16:48:57 2018 rev:13 rq:646958 version:15.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2018-11-01 18:55:03.037966245 +0100
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2018-11-10 16:49:09.952509279 +0100
@@ -0,0 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 6 13:45:16 UTC 2018 - [email protected]
+
+- Display new role dialogs in the workflow (FATE#325834)
+- Clean up (removed the openSUSE Kubic parts, it has been moved to
+ to a separate package)
+- 15.4
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-CAASP-15.3.tar.bz2
New:
----
skelcd-control-CAASP-15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-CAASP.spec ++++++
--- /var/tmp/diff_new_pack.71NVW3/_old 2018-11-10 16:49:12.236506384 +0100
+++ /var/tmp/diff_new_pack.71NVW3/_new 2018-11-10 16:49:12.236506384 +0100
@@ -33,29 +33,19 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 4.0.10
-%if 0%{?is_opensuse}
-# xsltproc - for building control.Kubic.xml from control.CAASP.xml
-BuildRequires: diffutils
-BuildRequires: libxslt-tools
-# we need to copy some parts from the openSUSE control.xml to Kubic
-BuildRequires: skelcd-control-openSUSE
-%endif
-
######################################################################
#
# Here is the list of Yast packages which are needed in the
# installation system (inst-sys) for the Yast installer
#
-# SLES specific Yast packages needed in the inst-sys
+# CaaSP specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
+
+# new role dialogs
+Requires: yast2-caasp >= 4.0.6
Requires: yast2-registration
-%if 0%{?is_susecaasp}
Requires: yast2-theme-SLE
-%else
-Requires: yast2-branding-openSUSE
-Requires: yast2-qt-branding-openSUSE
-%endif
# Generic Yast packages needed for the installer
Requires: autoyast2
@@ -65,8 +55,8 @@
Requires: yast2-fcoe-client
# For creating the AutoYast profile at the end of installation (bnc#887406)
Requires: yast2-firewall
-# instsys_cleanup
-Requires: yast2-installation >= 3.1.217.9
+# fixed role selection
+Requires: yast2-installation >= 4.0.73
Requires: yast2-iscsi-client
Requires: yast2-kdump
Requires: yast2-multipath
@@ -112,7 +102,7 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.3
+Version: 15.4
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
@@ -131,15 +121,6 @@
%setup -n %{name}-%{version}
-%if 0%{?is_opensuse}
-%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
#
# Verify syntax
@@ -151,13 +132,7 @@
# Add control file
#
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-%if 0%{?is_susecaasp}
install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%else
-%if 0%{?is_opensuse}
-install -m 644 control/control.Kubic.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%endif
-%endif
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -165,14 +140,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}%{?is_opensuse}
%if %{defined skelcdpath}
%dir %{skelcdpath}
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
-%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
+%license %{_prefix}/share/doc/packages/%{name}/LICENSE
%changelog
++++++ skelcd-control-CAASP-15.3.tar.bz2 -> skelcd-control-CAASP-15.4.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.3/.travis.sh
new/skelcd-control-CAASP-15.4/.travis.sh
--- old/skelcd-control-CAASP-15.3/.travis.sh 2018-10-16 11:01:45.000000000
+0200
+++ new/skelcd-control-CAASP-15.4/.travis.sh 2018-11-07 12:52:53.000000000
+0100
@@ -1,26 +1,7 @@
#! /bin/bash
-# fold the Travis output to make it better readable
-YELLOW='\033[33;1m'
-NO_COLOR='\033[0m'
-echo travis_fold:start:$BUILD_FLAVOR
-echo -e "${YELLOW}Build '${BUILD_FLAVOR}' flavor${NO_COLOR}"
-
set -e -x
-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
@@ -29,5 +10,3 @@
# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
yast-travis-ruby
-set +x
-echo travis_fold:end:$BUILD_FLAVOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.3/.travis.yml
new/skelcd-control-CAASP-15.4/.travis.yml
--- old/skelcd-control-CAASP-15.3/.travis.yml 2018-10-16 11:01:45.000000000
+0200
+++ new/skelcd-control-CAASP-15.4/.travis.yml 2018-11-07 12:52:53.000000000
+0100
@@ -11,5 +11,4 @@
script:
# 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
+ - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID"
skelcd-control-caasp-image ./.travis.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.3/control/Makefile
new/skelcd-control-CAASP-15.4/control/Makefile
--- old/skelcd-control-CAASP-15.3/control/Makefile 2018-10-16
11:01:45.000000000 +0200
+++ new/skelcd-control-CAASP-15.4/control/Makefile 2018-11-07
12:52:53.000000000 +0100
@@ -2,10 +2,3 @@
# checks only those control files that belong to this package
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.3/control/control.CAASP.xml
new/skelcd-control-CAASP-15.4/control/control.CAASP.xml
--- old/skelcd-control-CAASP-15.3/control/control.CAASP.xml 2018-10-16
11:01:45.000000000 +0200
+++ new/skelcd-control-CAASP-15.4/control/control.CAASP.xml 2018-11-07
12:52:53.000000000 +0100
@@ -261,6 +261,7 @@
</services>
<order config:type="integer">100</order>
+ <additional_dialogs>inst_casp_admin_role</additional_dialogs>
</system_role>
<system_role>
@@ -273,6 +274,7 @@
</services>
<order config:type="integer">200</order>
+ <additional_dialogs>inst_casp_worker_role</additional_dialogs>
</system_role>
<system_role>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.3/control/control.Kubic.xsl
new/skelcd-control-CAASP-15.4/control/control.Kubic.xsl
--- old/skelcd-control-CAASP-15.3/control/control.Kubic.xsl 2018-10-16
11:01:45.000000000 +0200
+++ new/skelcd-control-CAASP-15.4/control/control.Kubic.xsl 1970-01-01
01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-<!--
- 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";
- xmlns="http://www.suse.com/1.0/yast2ns";
- exclude-result-prefixes="n"
->
-
- <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']]]"
/>
-
- <!-- Add the "extra_urls" part from the normal openSUSE control file -->
- <xsl:template match="n:software">
- <xsl:copy>
- <xsl:apply-templates select="node()|@*"/>
- <!-- Make sure this is the openSUSE control file!, try both (old and the
new) locations -->
- <xsl:copy-of
select="document('/usr/lib/skelcd/CD1/control.xml')/*/n:software/n:extra_urls"/>
- <xsl:copy-of
select="document('/CD1/control.xml')/*/n:software/n:extra_urls"/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="n:micro_os_role">
- <micro_os_role>
- <label>openSUSE MicroOS</label>
- </micro_os_role>
- </xsl:template>
-
-</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.changes
new/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.changes
--- old/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.changes
2018-10-16 11:01:45.000000000 +0200
+++ new/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.changes
2018-11-07 12:52:53.000000000 +0100
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov 6 13:45:16 UTC 2018 - [email protected]
+
+- Display new role dialogs in the workflow (FATE#325834)
+- Clean up (removed the openSUSE Kubic parts, it has been moved to
+ to a separate package)
+- 15.4
+
+-------------------------------------------------------------------
Thu Oct 11 14:43:55 UTC 2018 - [email protected]
- fix bsc#1111541: do not enable container-feeder since this does
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.spec
new/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.spec
--- old/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.spec
2018-10-16 11:01:45.000000000 +0200
+++ new/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.spec
2018-11-07 12:52:53.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-CAASP
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
######################################################################
#
# IMPORTANT: Please do not change the control file or this spec file
@@ -33,29 +32,19 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 4.0.10
-%if 0%{?is_opensuse}
-# xsltproc - for building control.Kubic.xml from control.CAASP.xml
-BuildRequires: libxslt-tools
-BuildRequires: diffutils
-# we need to copy some parts from the openSUSE control.xml to Kubic
-BuildRequires: skelcd-control-openSUSE
-%endif
-
######################################################################
#
# Here is the list of Yast packages which are needed in the
# installation system (inst-sys) for the Yast installer
#
-# SLES specific Yast packages needed in the inst-sys
+# CaaSP specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
+
+# new role dialogs
+Requires: yast2-caasp >= 4.0.6
Requires: yast2-registration
-%if 0%{?is_susecaasp}
Requires: yast2-theme-SLE
-%else
-Requires: yast2-branding-openSUSE
-Requires: yast2-qt-branding-openSUSE
-%endif
# Generic Yast packages needed for the installer
Requires: autoyast2
@@ -65,8 +54,8 @@
Requires: yast2-fcoe-client
# For creating the AutoYast profile at the end of installation (bnc#887406)
Requires: yast2-firewall
-# instsys_cleanup
-Requires: yast2-installation >= 3.1.217.9
+# fixed role selection
+Requires: yast2-installation >= 4.0.73
Requires: yast2-iscsi-client
Requires: yast2-kdump
Requires: yast2-multipath
@@ -112,7 +101,7 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.3
+Version: 15.4
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
@@ -131,15 +120,6 @@
%setup -n %{name}-%{version}
-%if 0%{?is_opensuse}
-%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
#
# Verify syntax
@@ -151,14 +131,7 @@
# Add control file
#
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-%if 0%{?is_susecaasp}
install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%else
-%if 0%{?is_opensuse}
-install -m 644 control/control.Kubic.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%endif
-%endif
-
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -166,14 +139,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}%{?is_opensuse}
%if %{defined skelcdpath}
%dir %{skelcdpath}
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
-%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
+%license %{_prefix}/share/doc/packages/%{name}/LICENSE
%changelog
