Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2018-01-17 21:44:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-CAASP"
Wed Jan 17 21:44:05 2018 rev:5 rq:566472 version:15.0.11
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2017-09-19 16:20:43.721890555 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2018-01-17 21:44:06.287101392 +0100
@@ -1,0 +2,62 @@
+Tue Jan 16 17:01:09 UTC 2018 - [email protected]
+
+- do not define control.xml in %files when not CaaSP or openSUSE
+ (boo#1076173)
+- 15.0.11
+
+-------------------------------------------------------------------
+Tue Jan 16 14:37:52 UTC 2018 - [email protected]
+
+- use Tumbleweed style skelcdpath control file location macros
+ (boo#1076173)
+- 15.0.10
+
+-------------------------------------------------------------------
+Tue Jan 16 12:18:12 UTC 2018 - [email protected]
+
+- correct spec to not install control file in SLE 15 staging
+ (boo#1076173)
+- 15.0.9
+
+-------------------------------------------------------------------
+Fri Jan 12 13:49:33 UTC 2018 - [email protected]
+
+- correct Kubic.xsl related spec refs to use %is_opensuse instead
+ of !%is_susecaasp. skelcd-control-CaaSP is built for non-openSUSE
+ products that are not susecaasp, and previous arrangement caused
+ build failures. (boo#1075802)
+- 15.0.8
+
+-------------------------------------------------------------------
+Tue Dec 12 17:11:12 UTC 2017 - [email protected]
+
+- adjust subvolume list to have NoCOW /var instead of many
+ subvolumes (boo#1075369)
+- 15.0.7
+
+-------------------------------------------------------------------
+Tue Dec 5 08:31:11 UTC 2017 - [email protected]
+
+- openSUSE Kubic: copy "extra_urls" configuration from the standard
+ openSUSE product (bsc#1071217)
+- 15.0.6
+
+-------------------------------------------------------------------
+Thu Oct 26 15:15:58 CEST 2017 - [email protected]
+
+- adjust subvolume list in control.xml to support all archs (fate#318196)
+- 15.0.5
+
+-------------------------------------------------------------------
+Mon Oct 23 17:22:58 CEST 2017 - [email protected]
+
+- Use new storage-ng elements for partitioning in control.xml (fate#318196)
+- 15.0.4
+
+-------------------------------------------------------------------
+Thu Sep 21 07:34:53 UTC 2017 - [email protected]
+
+- Adapt to changes in roles (needed for fixing bsc#1049297)
+- 15.0.3
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-CAASP-15.0.2.tar.bz2
New:
----
skelcd-control-CAASP-15.0.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-CAASP.spec ++++++
--- /var/tmp/diff_new_pack.p2HNph/_old 2018-01-17 21:44:06.827076118 +0100
+++ /var/tmp/diff_new_pack.p2HNph/_new 2018-01-17 21:44:06.831075930 +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
@@ -31,12 +31,14 @@
# xmllint (for validation)
BuildRequires: libxml2-tools
# RNG validation schema
-BuildRequires: yast2-installation-control >= 3.1.13.12
+BuildRequires: yast2-installation-control >= 4.0.0
-%if !0%{?is_susecaasp}
+%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
######################################################################
@@ -109,7 +111,7 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.0.2
+Version: 15.0.11
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
@@ -117,6 +119,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
+%if 0%{?suse_version} >= 1500 && !0%{?skelcd_compat}
+%define skelcdpath /usr/lib/skelcd
+%endif
+
%description
The package contains the CaaSP control file needed for installation.
@@ -124,7 +130,7 @@
%setup -n %{name}-%{version}
-%if !0%{?is_susecaasp}
+%if 0%{?is_opensuse}
%build
# build control.Kubic.xml from control.CAASP.xml
make -C control control.Kubic.xml
@@ -143,12 +149,13 @@
#
# Add control file
#
+mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
%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
+install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
%else
-mkdir -p $RPM_BUILD_ROOT/CD1
-install -m 644 control/control.Kubic.xml $RPM_BUILD_ROOT/CD1/control.xml
+%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)
@@ -157,11 +164,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}
-%dir /usr/lib/skelcd
-/usr/lib/skelcd/CD1
-%else
-/CD1
+%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
++++++ skelcd-control-CAASP-15.0.2.tar.bz2 ->
skelcd-control-CAASP-15.0.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.2/.travis.sh
new/skelcd-control-CAASP-15.0.11/.travis.sh
--- old/skelcd-control-CAASP-15.0.2/.travis.sh 2017-09-19 14:07:13.032827172
+0200
+++ new/skelcd-control-CAASP-15.0.11/.travis.sh 2018-01-16 17:34:58.000000000
+0100
@@ -1,5 +1,11 @@
#! /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
@@ -22,3 +28,6 @@
# 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
+
+set +x
+echo travis_fold:end:$BUILD_FLAVOR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.2/.travis.yml
new/skelcd-control-CAASP-15.0.11/.travis.yml
--- old/skelcd-control-CAASP-15.0.2/.travis.yml 2017-09-19 14:07:13.032827172
+0200
+++ new/skelcd-control-CAASP-15.0.11/.travis.yml 2018-01-16
17:34:58.000000000 +0100
@@ -5,6 +5,8 @@
before_install:
- docker build -t skelcd-control-caasp-image .
+ # list the installed packages (just for easier debugging)
+ - docker run --rm -it skelcd-control-caasp-image rpm -qa | sort
script:
# the builds can run sequentially, the build in Docker is fast and Docker
isolates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.2/Dockerfile
new/skelcd-control-CAASP-15.0.11/Dockerfile
--- old/skelcd-control-CAASP-15.0.2/Dockerfile 2017-09-19 09:08:12.196558173
+0200
+++ new/skelcd-control-CAASP-15.0.11/Dockerfile 2018-01-16 17:34:58.000000000
+0100
@@ -1,2 +1,4 @@
FROM yastdevel/ruby
+# install the openSUSE control.xml, we need to copy some parts to Kubic
+RUN zypper --non-interactive in --no-recommends skelcd-control-openSUSE
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.2/control/control.CAASP.glade
new/skelcd-control-CAASP-15.0.11/control/control.CAASP.glade
--- old/skelcd-control-CAASP-15.0.2/control/control.CAASP.glade 2018-01-17
21:44:06.907072373 +0100
+++ new/skelcd-control-CAASP-15.0.11/control/control.CAASP.glade
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to control.CAASP.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.2/control/control.CAASP.xml
new/skelcd-control-CAASP-15.0.11/control/control.CAASP.xml
--- old/skelcd-control-CAASP-15.0.2/control/control.CAASP.xml 2017-09-19
09:08:12.200558173 +0200
+++ new/skelcd-control-CAASP-15.0.11/control/control.CAASP.xml 2018-01-16
17:34:58.000000000 +0100
@@ -133,131 +133,105 @@
</software>
<partitioning>
- <try_separate_home config:type="boolean">true</try_separate_home>
- <limit_try_home>35GB</limit_try_home>
- <!-- use /var/lib/docker as separate partition if 10+ GB available
(fate#323532) -->
-
- <!-- NOTICE: This is a hack, introduced to make this feature possible
- against all odds at the very latest stages of CaaSP 1.0
- development without breaking the entire storage proposal logic.
- It is strongly advised not to use this in general.
- Please contact the YaST team if you feel you need this. -->
- <home_path>/var/lib/docker</home_path>
- <home_fs>btrfs</home_fs>
- <root_fs>btrfs</root_fs>
- <root_space_percent>80</root_space_percent>
- <root_base_size>10GB</root_base_size>
- <root_max_size>30GB</root_max_size>
- <proposal_lvm config:type="boolean">false</proposal_lvm>
- <vm_desired_size>15GB</vm_desired_size>
- <vm_home_max_size>25GB</vm_home_max_size>
- <!-- always propose snapper enabled, therefore no increase
(bsc#1019652) -->
- <btrfs_increase_percentage
config:type="integer">0</btrfs_increase_percentage>
- <!-- the default subvolume "@" was requested by product management -->
- <btrfs_default_subvolume>@</btrfs_default_subvolume>
- <proposal_settings_editable
config:type="boolean">false</proposal_settings_editable>
<expert_partitioner_warning
config:type="boolean">true</expert_partitioner_warning>
- <root_subvolume_read_only
config:type="boolean">true</root_subvolume_read_only>
- <!-- Subvolumes to be created for a Btrfs root file system -->
- <!-- copy_on_write is true by default -->
- <!-- The XML parser is very simplistic, thus not using attributes, but
sub-elements -->
- <subvolumes config:type="list">
- <subvolume>
- <path>root</path>
- </subvolume>
- <subvolume>
- <path>tmp</path>
- </subvolume>
- <subvolume>
- <path>home</path>
- </subvolume>
- <subvolume>
- <path>cloud-init-config</path>
- </subvolume>
- <subvolume>
- <path>var/cache</path>
- </subvolume>
- <subvolume>
- <path>var/crash</path>
- </subvolume>
- <subvolume>
- <path>var/spool</path>
- </subvolume>
- <subvolume>
- <path>var/lib/ca-certificates</path>
- </subvolume>
- <subvolume>
- <path>var/lib/cloud</path>
- </subvolume>
- <subvolume>
- <path>var/lib/docker</path>
- </subvolume>
- <subvolume>
- <path>var/lib/dockershim</path>
- </subvolume>
- <subvolume>
- <path>var/lib/kubelet</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/lib/mysql</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/lib/ntp</path>
- </subvolume>
- <subvolume>
- <path>var/lib/etcd</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/lib/overlay</path>
- </subvolume>
- <subvolume>
- <path>var/lib/systemd</path>
- </subvolume>
- <subvolume>
- <path>var/lib/vmware</path>
- </subvolume>
- <subvolume>
- <path>var/lib/wicked</path>
- </subvolume>
- <subvolume>
- <path>var/lib/machines</path>
- </subvolume>
- <subvolume>
- <path>var/lib/misc</path>
- </subvolume>
- <subvolume>
- <path>var/lib/nfs</path>
- </subvolume>
- <subvolume>
- <path>var/lib/rollback</path>
- </subvolume>
- <subvolume>
- <path>var/log</path>
- </subvolume>
- <subvolume>
- <path>var/tmp</path>
- </subvolume>
-
- <!-- architecture specific subvolumes -->
-
- <subvolume>
- <path>boot/grub2/i386-pc</path>
- <archs>x86_64</archs>
- </subvolume>
- <subvolume>
- <path>boot/grub2/x86_64-efi</path>
- <archs>x86_64</archs>
- </subvolume>
- <subvolume>
- <path>boot/grub2/x86_64-efi</path>
- <archs>x86_64</archs>
- </subvolume>
- </subvolumes>
+ <proposal>
+ <lvm config:type="boolean">false</lvm>
+ <proposal_settings_editable
config:type="boolean">false</proposal_settings_editable>
+ <root_subvolume_read_only
config:type="boolean">true</root_subvolume_read_only>
+ </proposal>
+
+ <volumes config:type="list">
+ <!-- The / filesystem -->
+ <volume>
+ <mount_point>/</mount_point>
+ <!-- Default == final, since the user can't change it -->
+ <fs_type>btrfs</fs_type>
+ <desired_size config:type="disksize">25 GiB</desired_size>
+ <min_size config:type="disksize">20 GiB</min_size>
+ <max_size config:type="disksize">30 GiB</max_size>
+ <weight config:type="integer">80</weight>
+ <!-- Always use snapshots, no matter what -->
+ <snapshots config:type="boolean">true</snapshots>
+ <snapshots_configurable
config:type="boolean">false</snapshots_configurable>
+
+ <!-- You don't want to miss the / volume -->
+ <proposed_configurable
config:type="boolean">false</proposed_configurable>
+
+ <!-- the default subvolume "@" was requested by product
management -->
+ <btrfs_default_subvolume>@</btrfs_default_subvolume>
+
+ <!-- Subvolumes to be created for a Btrfs root file system -->
+ <!-- copy_on_write is true by default -->
+ <!-- The XML parser is very simplistic, thus not using
attributes, but sub-elements -->
+ <subvolumes config:type="list">
+ <subvolume>
+ <path>root</path>
+ </subvolume>
+ <subvolume>
+ <path>tmp</path>
+ </subvolume>
+ <subvolume>
+ <path>home</path>
+ </subvolume>
+ <subvolume>
+ <path>cloud-init-config</path>
+ </subvolume>
+ <!-- unified var subvolume -
https://lists.opensuse.org/opensuse-packaging/2017-11/msg00017.html -->
+ <subvolume>
+ <path>var</path>
+ <copy_on_write
config:type="boolean">false</copy_on_write>
+ </subvolume>
+
+ <!-- architecture specific subvolumes -->
+
+ <subvolume>
+ <path>boot/grub2/arm64-efi</path>
+ <archs>aarch64</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/i386-pc</path>
+ <archs>x86_64</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/powerpc-ieee1275</path>
+ <archs>ppc,!board_powernv</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/s390x-emu</path>
+ <archs>s390</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/x86_64-efi</path>
+ <archs>x86_64</archs>
+ </subvolume>
+ </subvolumes>
+ </volume>
+
+ <!-- use /var/lib/docker as separate partition if 10+ GB available
(fate#323532) -->
+ <volume>
+ <mount_point>/var/lib/docker</mount_point>
+ <!-- Default == final, since the user can't change it -->
+ <fs_type>btrfs</fs_type>
+ <snapshots config:type="boolean">false</snapshots>
+ <snapshots_configurable
config:type="boolean">false</snapshots_configurable>
+
+ <desired_size config:type="disksize">15 GiB</desired_size>
+ <min_size config:type="disksize">10 GiB</min_size>
+ <max_size config:type="disksize">unlimited</max_size>
+ <weight config:type="integer">20</weight>
+
+ <!-- Give up in a separate partition if the min size doesn't
fit -->
+ <disable_order config:type="integer">1</disable_order>
+
+ <!-- If this volume is disabled, we want "/" to increase -->
+ <fallback_for_desired_size>/</fallback_for_desired_size>
+ <fallback_for_max_size>/</fallback_for_max_size>
+ <fallback_for_weight>/</fallback_for_weight>
+ </volume>
+ <!-- No swap partition is defined, so it's never created -->
+ </volumes>
</partitioning>
<network>
@@ -281,6 +255,8 @@
<service><name>salt-minion</name></service>
<service><name>admin-node-setup</name></service>
</services>
+
+ <order config:type="integer">100</order>
</system_role>
<system_role>
@@ -291,10 +267,14 @@
<service><name>container-feeder</name></service>
<service><name>salt-minion</name></service>
</services>
+
+ <order config:type="integer">200</order>
</system_role>
<system_role>
<id>none_role</id>
+
+ <order config:type="integer">300</order>
</system_role>
</system_roles>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.2/control/control.Kubic.xsl
new/skelcd-control-CAASP-15.0.11/control/control.Kubic.xsl
--- old/skelcd-control-CAASP-15.0.2/control/control.Kubic.xsl 2017-09-19
14:07:13.032827172 +0200
+++ new/skelcd-control-CAASP-15.0.11/control/control.Kubic.xsl 2018-01-16
17:34:58.000000000 +0100
@@ -22,4 +22,13 @@
<!-- 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:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.changes
new/skelcd-control-CAASP-15.0.11/package/skelcd-control-CAASP.changes
--- old/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.changes
2017-09-19 14:07:13.032827172 +0200
+++ new/skelcd-control-CAASP-15.0.11/package/skelcd-control-CAASP.changes
2018-01-16 17:34:58.000000000 +0100
@@ -1,4 +1,66 @@
-------------------------------------------------------------------
+Tue Jan 16 17:01:09 UTC 2018 - [email protected]
+
+- do not define control.xml in %files when not CaaSP or openSUSE
+ (boo#1076173)
+- 15.0.11
+
+-------------------------------------------------------------------
+Tue Jan 16 14:37:52 UTC 2018 - [email protected]
+
+- use Tumbleweed style skelcdpath control file location macros
+ (boo#1076173)
+- 15.0.10
+
+-------------------------------------------------------------------
+Tue Jan 16 12:18:12 UTC 2018 - [email protected]
+
+- correct spec to not install control file in SLE 15 staging
+ (boo#1076173)
+- 15.0.9
+
+-------------------------------------------------------------------
+Fri Jan 12 13:49:33 UTC 2018 - [email protected]
+
+- correct Kubic.xsl related spec refs to use %is_opensuse instead
+ of !%is_susecaasp. skelcd-control-CaaSP is built for non-openSUSE
+ products that are not susecaasp, and previous arrangement caused
+ build failures. (boo#1075802)
+- 15.0.8
+
+-------------------------------------------------------------------
+Tue Dec 12 17:11:12 UTC 2017 - [email protected]
+
+- adjust subvolume list to have NoCOW /var instead of many
+ subvolumes (boo#1075369)
+- 15.0.7
+
+-------------------------------------------------------------------
+Tue Dec 5 08:31:11 UTC 2017 - [email protected]
+
+- openSUSE Kubic: copy "extra_urls" configuration from the standard
+ openSUSE product (bsc#1071217)
+- 15.0.6
+
+-------------------------------------------------------------------
+Thu Oct 26 15:15:58 CEST 2017 - [email protected]
+
+- adjust subvolume list in control.xml to support all archs (fate#318196)
+- 15.0.5
+
+-------------------------------------------------------------------
+Mon Oct 23 17:22:58 CEST 2017 - [email protected]
+
+- Use new storage-ng elements for partitioning in control.xml (fate#318196)
+- 15.0.4
+
+-------------------------------------------------------------------
+Thu Sep 21 07:34:53 UTC 2017 - [email protected]
+
+- Adapt to changes in roles (needed for fixing bsc#1049297)
+- 15.0.3
+
+-------------------------------------------------------------------
Tue Sep 19 08:13:49 UTC 2017 - [email protected]
- Patch control.Kubic.xml using a XSL file, that's more robust
@@ -34,7 +96,7 @@
-------------------------------------------------------------------
Tue Jul 4 14:17:04 CEST 2017 - [email protected]
-- Reduce min size to create a separate /var/lib/docker partition
+- Reduce min size to create a separate /var/lib/docker partition
to 35 GB (Fate#323532)
- 12.2.37
@@ -73,7 +135,7 @@
-------------------------------------------------------------------
Wed May 24 14:51:45 CEST 2017 - [email protected]
-- /usr/lib/skelcd/CD1 instead of /CD1
+- /usr/lib/skelcd/CD1 instead of /CD1
-------------------------------------------------------------------
Wed May 17 11:46:23 CEST 2017 - [email protected]
@@ -100,7 +162,7 @@
Thu May 4 09:48:44 CEST 2017 - [email protected]
- Added NoCOW subvolume /var/lib/dockershim (bsc#1037208)
-- 12.2.29
+- 12.2.29
-------------------------------------------------------------------
Tue Apr 4 13:06:02 UTC 2017 - [email protected]
@@ -226,7 +288,7 @@
Wed Dec 14 12:30:32 CET 2016 - [email protected]
- Added new parameter for CASP read-only Btrfs root subvolume
- (Fate#321755)
+ (Fate#321755)
- 12.2.10
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.spec
new/skelcd-control-CAASP-15.0.11/package/skelcd-control-CAASP.spec
--- old/skelcd-control-CAASP-15.0.2/package/skelcd-control-CAASP.spec
2017-09-19 14:07:13.032827172 +0200
+++ new/skelcd-control-CAASP-15.0.11/package/skelcd-control-CAASP.spec
2018-01-16 17:34:58.000000000 +0100
@@ -31,12 +31,14 @@
# xmllint (for validation)
BuildRequires: libxml2-tools
# RNG validation schema
-BuildRequires: yast2-installation-control >= 3.1.13.12
+BuildRequires: yast2-installation-control >= 4.0.0
-%if !0%{?is_susecaasp}
+%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
######################################################################
@@ -109,7 +111,7 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.0.2
+Version: 15.0.11
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
@@ -117,6 +119,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
+%if 0%{?suse_version} >= 1500 && !0%{?skelcd_compat}
+%define skelcdpath /usr/lib/skelcd
+%endif
+
%description
The package contains the CaaSP control file needed for installation.
@@ -124,7 +130,7 @@
%setup -n %{name}-%{version}
-%if !0%{?is_susecaasp}
+%if 0%{?is_opensuse}
%build
# build control.Kubic.xml from control.CAASP.xml
make -C control control.Kubic.xml
@@ -143,13 +149,15 @@
#
# Add control file
#
+mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
%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
+install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
%else
-mkdir -p $RPM_BUILD_ROOT/CD1
-install -m 644 control/control.Kubic.xml $RPM_BUILD_ROOT/CD1/control.xml
+%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}
@@ -157,11 +165,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}
-%dir /usr/lib/skelcd
-/usr/lib/skelcd/CD1
-%else
-/CD1
+%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
