Hello community, here is the log from the commit of package skelcd-control-Kubic for openSUSE:Factory checked in at 2018-11-01 19:06:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-Kubic (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-Kubic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-Kubic" Thu Nov 1 19:06:31 2018 rev:19 rq:645177 version:15.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-Kubic/skelcd-control-Kubic.changes 2018-09-13 12:09:51.538405776 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-Kubic.new/skelcd-control-Kubic.changes 2018-11-01 19:06:33.662022995 +0100 @@ -1,0 +2,9 @@ +Fri Oct 26 15:36:28 UTC 2018 - lslezak@suse.cz + +- Display a new dialog when selecting the Kubeadm role + (FATE#325834) +- Removed the SLE/CaaSP handling, this is just an openSUSE package +- Use %license for the license file +- 15.1.7 + +------------------------------------------------------------------- Old: ---- skelcd-control-Kubic-15.1.6.tar.bz2 New: ---- skelcd-control-Kubic-15.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-Kubic.spec ++++++ --- /var/tmp/diff_new_pack.bPMuPL/_old 2018-11-01 19:06:34.126023024 +0100 +++ /var/tmp/diff_new_pack.bPMuPL/_new 2018-11-01 19:06:34.130023024 +0100 @@ -33,13 +33,11 @@ # RNG validation schema BuildRequires: yast2-installation-control >= 4.0.10 -%if 0%{?is_opensuse} # xsltproc - for building control.TWKubic.xml from control.Kubic.xml BuildRequires: diffutils BuildRequires: libxslt-tools # we need to copy some parts from the openSUSE control.xml to Kubic BuildRequires: skelcd-control-openSUSE -%endif ###################################################################### # @@ -47,15 +45,13 @@ # installation system (inst-sys) for the Yast installer # -# SLES specific Yast packages needed in the inst-sys +# Kubic specific Yast packages needed in the inst-sys # to provide the functionality needed by this control file +Requires: yast2-caasp >= 4.1.1 -%if 0%{?is_susecaasp} -Requires: yast2-theme-SLE -%else +# branding Requires: yast2-branding-openSUSE Requires: yast2-qt-branding-openSUSE -%endif # Generic Yast packages needed for the installer Requires: autoyast2 @@ -92,6 +88,23 @@ Conflicts: product_control Provides: product_control +# we really do not need the YaST packages for building, ignore the dependencies +# to have faster builds and less rebuilds triggered by dependencies +# these are pulled in by the skelcd-control-openSUSE dependencies +#!BuildIgnore: yast2-caasp yast2-branding-openSUSE yast2-qt-branding-openSUSE +#!BuildIgnore: autoyast2 yast2-add-on yast2-buildtools yast2-devtools +#!BuildIgnore: yast2-fcoe-client yast2-firewall +#!BuildIgnore: yast2-installation yast2-iscsi-client yast2-kdump yast2-multipath +#!BuildIgnore: yast2-network yast2-nfs-client yast2-ntp-client yast2-proxy +#!BuildIgnore: yast2-services-manager yast2-slp yast2-trans-stats yast2-tune +#!BuildIgnore: yast2-update yast2-users yast2-x11 yast2-rdp +#!BuildIgnore: yast2-reipl yast2-s390 yast2-vm +#!BuildIgnore: rubygem(%{rb_default_ruby_abi}:byebug) +#!BuildIgnore: yast2-branding-openSUSE-Oxygen yast2-configuration-management +#!BuildIgnore: yast2-core yast2-hardware-detection yast2-installation-control +#!BuildIgnore: yast2-logs yast2-perl-bindings yast2-pkg-bindings yast2-ruby-bindings +#!BuildIgnore: yast2 yast2-ycp-ui-bindings + # Architecture specific packages # %ifarch s390 s390x @@ -108,7 +121,7 @@ Url: https://github.com/yast/skelcd-control-Kubic AutoReqProv: off -Version: 15.1.6 +Version: 15.1.7 Release: 0 Summary: The Kubic control file needed for installation License: MIT @@ -127,14 +140,12 @@ %setup -n %{name}-%{version} -%if 0%{?is_opensuse} %build # build control.TWKubic.xml from control.Kubic.xml make -C control control.TWKubic.xml # display the changes (just for easier debugging) # don't fail, a difference is expected diff -u control/control.Kubic.xml control/control.TWKubic.xml || : -%endif %check # @@ -147,13 +158,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.TWKubic.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} @@ -161,14 +166,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-Kubic-15.1.6.tar.bz2 -> skelcd-control-Kubic-15.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/.travis.sh new/skelcd-control-Kubic-15.1.7/.travis.sh --- old/skelcd-control-Kubic-15.1.6/.travis.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/skelcd-control-Kubic-15.1.7/.travis.sh 2018-10-29 08:38:03.000000000 +0100 @@ -0,0 +1,10 @@ +#! /bin/bash + +set -e -x + +make -C control check + +# the "yast-travis-ruby" script is included in the base yastdevel/ruby image +# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby +yast-travis-ruby + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/.travis.yml new/skelcd-control-Kubic-15.1.7/.travis.yml --- old/skelcd-control-Kubic-15.1.6/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/skelcd-control-Kubic-15.1.7/.travis.yml 2018-10-29 08:38:03.000000000 +0100 @@ -0,0 +1,9 @@ +sudo: required +language: bash +services: + - docker + +before_install: + - docker build -t yast-skelcd-control-kubic-image . +script: + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-skelcd-control-kubic-image ./.travis.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/README.md new/skelcd-control-Kubic-15.1.7/README.md --- old/skelcd-control-Kubic-15.1.6/README.md 2018-09-06 14:43:34.000000000 +0200 +++ new/skelcd-control-Kubic-15.1.7/README.md 2018-10-29 08:38:03.000000000 +0100 @@ -1,7 +1,7 @@ skelcd-control-Kubic =================== -[](https://travis-ci.org/yast/skelcd-control-CAASP) +[](https://travis-ci.org/yast/skelcd-control-Kubic) Installation control file for openSUSE Kubic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/control/control.Kubic.xml new/skelcd-control-Kubic-15.1.7/control/control.Kubic.xml --- old/skelcd-control-Kubic-15.1.6/control/control.Kubic.xml 2018-09-06 14:43:34.000000000 +0200 +++ new/skelcd-control-Kubic-15.1.7/control/control.Kubic.xml 2018-10-29 08:38:03.000000000 +0100 @@ -250,6 +250,7 @@ </software> <order config:type="integer">200</order> + <additional_dialogs>inst_kubic_kubeadm_role</additional_dialogs> </system_role> <system_role> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.changes new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.changes --- old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.changes 2018-09-06 14:43:34.000000000 +0200 +++ new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.changes 2018-10-29 08:38:03.000000000 +0100 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Oct 26 15:36:28 UTC 2018 - lslezak@suse.cz + +- Display a new dialog when selecting the Kubeadm role + (FATE#325834) +- Removed the SLE/CaaSP handling, this is just an openSUSE package +- Use %license for the license file +- 15.1.7 + +------------------------------------------------------------------- Tue Aug 21 15:32:55 UTC 2018 - rbrown@suse.com - Run partition proposal before bootloader proposal (boo#1099762) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.spec new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.spec --- old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.spec 2018-09-06 14:43:34.000000000 +0200 +++ new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.spec 2018-10-29 08:38:03.000000000 +0100 @@ -33,13 +33,11 @@ # RNG validation schema BuildRequires: yast2-installation-control >= 4.0.10 -%if 0%{?is_opensuse} # xsltproc - for building control.TWKubic.xml from control.Kubic.xml BuildRequires: libxslt-tools BuildRequires: diffutils # we need to copy some parts from the openSUSE control.xml to Kubic BuildRequires: skelcd-control-openSUSE -%endif ###################################################################### # @@ -47,15 +45,13 @@ # installation system (inst-sys) for the Yast installer # -# SLES specific Yast packages needed in the inst-sys +# Kubic specific Yast packages needed in the inst-sys # to provide the functionality needed by this control file +Requires: yast2-caasp >= 4.1.1 -%if 0%{?is_susecaasp} -Requires: yast2-theme-SLE -%else +# branding Requires: yast2-branding-openSUSE Requires: yast2-qt-branding-openSUSE -%endif # Generic Yast packages needed for the installer Requires: autoyast2 @@ -92,6 +88,23 @@ Conflicts: product_control Provides: product_control +# we really do not need the YaST packages for building, ignore the dependencies +# to have faster builds and less rebuilds triggered by dependencies +# these are pulled in by the skelcd-control-openSUSE dependencies +#!BuildIgnore: yast2-caasp yast2-branding-openSUSE yast2-qt-branding-openSUSE +#!BuildIgnore: autoyast2 yast2-add-on yast2-buildtools yast2-devtools +#!BuildIgnore: yast2-fcoe-client yast2-firewall +#!BuildIgnore: yast2-installation yast2-iscsi-client yast2-kdump yast2-multipath +#!BuildIgnore: yast2-network yast2-nfs-client yast2-ntp-client yast2-proxy +#!BuildIgnore: yast2-services-manager yast2-slp yast2-trans-stats yast2-tune +#!BuildIgnore: yast2-update yast2-users yast2-x11 yast2-rdp +#!BuildIgnore: yast2-reipl yast2-s390 yast2-vm +#!BuildIgnore: rubygem(%{rb_default_ruby_abi}:byebug) +#!BuildIgnore: yast2-branding-openSUSE-Oxygen yast2-configuration-management +#!BuildIgnore: yast2-core yast2-hardware-detection yast2-installation-control +#!BuildIgnore: yast2-logs yast2-perl-bindings yast2-pkg-bindings yast2-ruby-bindings +#!BuildIgnore: yast2 yast2-ycp-ui-bindings + # Architecture specific packages # %ifarch s390 s390x @@ -108,7 +121,7 @@ Url: https://github.com/yast/skelcd-control-Kubic AutoReqProv: off -Version: 15.1.6 +Version: 15.1.7 Release: 0 Summary: The Kubic control file needed for installation License: MIT @@ -127,14 +140,12 @@ %setup -n %{name}-%{version} -%if 0%{?is_opensuse} %build # build control.TWKubic.xml from control.Kubic.xml make -C control control.TWKubic.xml # display the changes (just for easier debugging) # don't fail, a difference is expected diff -u control/control.Kubic.xml control/control.TWKubic.xml || : -%endif %check # @@ -147,14 +158,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.TWKubic.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} @@ -162,14 +166,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