Hello community,
here is the log from the commit of package skelcd-control-MicroOS for
openSUSE:Factory checked in at 2020-11-21 12:40:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-MicroOS.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-MicroOS"
Sat Nov 21 12:40:05 2020 rev:14 rq:849242 version:20201117
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-MicroOS/skelcd-control-MicroOS.changes
2020-07-30 10:00:38.203240427 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-MicroOS.new.5913/skelcd-control-MicroOS.changes
2020-11-23 10:50:25.846598691 +0100
@@ -1,0 +2,12 @@
+Tue Nov 17 17:00:10 CEST 2020 - Richard Brown <rbr...@suse.de>
+
+- Normalise & correct minimum partition requirements (boo#1178895)
+- 20201117
+
+-------------------------------------------------------------------
+Wed Sep 23 18:21:25 UTC 2020 - Jan Engelhardt <jeng...@inai.de>
+
+- Modernize specfile: avoid mixing old $RPM_* shell vars
+ and macros.
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-MicroOS-20200729.tar.bz2
New:
----
skelcd-control-MicroOS-20201117.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-MicroOS.spec ++++++
--- /var/tmp/diff_new_pack.JceytF/_old 2020-11-23 10:50:26.290599135 +0100
+++ /var/tmp/diff_new_pack.JceytF/_new 2020-11-23 10:50:26.294599139 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-MicroOS
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -116,9 +116,9 @@
#
######################################################################
-Url: https://github.com/yast/skelcd-control-MicroOS
+URL: https://github.com/yast/skelcd-control-MicroOS
AutoReqProv: off
-Version: 20200729
+Version: 20201117
Release: 0
Summary: The MicroOS control file needed for installation
License: MIT
@@ -154,12 +154,12 @@
#
# Add control file
#
-mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-install -m 644 control/control.TWMicroOS.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
+mkdir -p %{buildroot}/%{?skelcdpath}/CD1
+install -m 644 control/control.TWMicroOS.xml
%{buildroot}/%{?skelcdpath}/CD1/control.xml
# install LICENSE (required by build service check)
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
-install -m 644 LICENSE $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
+mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
+install -m 644 LICENSE %{buildroot}/%{_defaultdocdir}/%{name}
%files
%defattr(644,root,root,755)
@@ -168,7 +168,7 @@
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%doc %dir %{_prefix}/share/doc/packages/%{name}
-%license %{_prefix}/share/doc/packages/%{name}/LICENSE
+%doc %dir %{_defaultdocdir}/%{name}
+%license %{_defaultdocdir}/%{name}/LICENSE
%changelog
++++++ skelcd-control-MicroOS-20200729.tar.bz2 ->
skelcd-control-MicroOS-20201117.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20200729/control/control.MicroOS.xml
new/skelcd-control-MicroOS-20201117/control/control.MicroOS.xml
--- old/skelcd-control-MicroOS-20200729/control/control.MicroOS.xml
2020-07-29 14:06:09.000000000 +0200
+++ new/skelcd-control-MicroOS-20201117/control/control.MicroOS.xml
2020-11-18 10:18:07.000000000 +0100
@@ -115,8 +115,8 @@
<!-- Default == final, since the user can't change it -->
<fs_type>btrfs</fs_type>
<desired_size config:type="disksize">20 GiB</desired_size>
- <min_size config:type="disksize">11 GiB</min_size>
- <max_size config:type="disksize">40 GiB</max_size>
+ <min_size config:type="disksize">5 GiB</min_size>
+ <max_size config:type="disksize">20 GiB</max_size>
<weight config:type="integer">20</weight>
<!-- Always use snapshots, no matter what -->
<snapshots config:type="boolean">true</snapshots>
@@ -187,7 +187,7 @@
<snapshots_configurable
config:type="boolean">false</snapshots_configurable>
<desired_size config:type="disksize">19 GiB</desired_size>
- <min_size config:type="disksize">8 GiB</min_size>
+ <min_size config:type="disksize">5 GiB</min_size>
<max_size config:type="disksize">unlimited</max_size>
<weight config:type="integer">40</weight>
@@ -260,9 +260,9 @@
<!-- Default == final, since the user can't change it -->
<fs_type>btrfs</fs_type>
<desired_size config:type="disksize">20 GiB</desired_size>
- <min_size config:type="disksize">11 GiB</min_size>
+ <min_size config:type="disksize">5 GiB</min_size>
<max_size config:type="disksize">unlimited</max_size>
- <weight config:type="integer">40</weight>
+ <weight config:type="integer">20</weight>
<!-- Always use snapshots, no matter what -->
<snapshots config:type="boolean">true</snapshots>
<snapshots_configurable
config:type="boolean">false</snapshots_configurable>
@@ -284,6 +284,7 @@
</subvolume>
<subvolume>
<path>home</path>
+ <copy_on_write
config:type="boolean">false</copy_on_write>
</subvolume>
<subvolume>
<path>opt</path>
@@ -296,7 +297,12 @@
</subvolume>
<subvolume>
<path>usr/local</path>
- </subvolume>
+ </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 -->
@@ -323,28 +329,6 @@
</subvolumes>
</volume>
- <volume>
- <!-- unified var partition -
https://lists.opensuse.org/opensuse-packaging/2017-11/msg00017.html -->
- <mount_point>/var</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">19 GiB</desired_size>
- <min_size config:type="disksize">8 GiB</min_size>
- <max_size config:type="disksize">unlimited</max_size>
- <weight config:type="integer">10</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>
@@ -382,9 +366,9 @@
<!-- Default == final, since the user can't change it -->
<fs_type>btrfs</fs_type>
<desired_size config:type="disksize">20 GiB</desired_size>
- <min_size config:type="disksize">11 GiB</min_size>
+ <min_size config:type="disksize">5 GiB</min_size>
<max_size config:type="disksize">unlimited</max_size>
- <weight config:type="integer">40</weight>
+ <weight config:type="integer">20</weight>
<!-- Always use snapshots, no matter what -->
<snapshots config:type="boolean">true</snapshots>
<snapshots_configurable
config:type="boolean">false</snapshots_configurable>
@@ -406,6 +390,7 @@
</subvolume>
<subvolume>
<path>home</path>
+ <copy_on_write
config:type="boolean">false</copy_on_write>
</subvolume>
<subvolume>
<path>opt</path>
@@ -413,11 +398,16 @@
<subvolume>
<path>srv</path>
</subvolume>
- <subvolume>
+ <subvolume>
<path>boot/writable</path>
</subvolume>
<subvolume>
<path>usr/local</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 -->
@@ -445,28 +435,6 @@
</subvolumes>
</volume>
- <volume>
- <!-- unified var partition -
https://lists.opensuse.org/opensuse-packaging/2017-11/msg00017.html -->
- <mount_point>/var</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">19 GiB</desired_size>
- <min_size config:type="disksize">8 GiB</min_size>
- <max_size config:type="disksize">unlimited</max_size>
- <weight config:type="integer">10</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>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20200729/package/skelcd-control-MicroOS.changes
new/skelcd-control-MicroOS-20201117/package/skelcd-control-MicroOS.changes
--- old/skelcd-control-MicroOS-20200729/package/skelcd-control-MicroOS.changes
2020-07-29 14:06:09.000000000 +0200
+++ new/skelcd-control-MicroOS-20201117/package/skelcd-control-MicroOS.changes
2020-11-18 10:18:07.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Nov 17 17:00:10 CEST 2020 - Richard Brown <rbr...@suse.de>
+
+- Normalise & correct minimum partition requirements (boo#1178895)
+- 20201117
+
+-------------------------------------------------------------------
+Wed Sep 23 18:21:25 UTC 2020 - Jan Engelhardt <jeng...@inai.de>
+
+- Modernize specfile: avoid mixing old $RPM_* shell vars
+ and macros.
+
+-------------------------------------------------------------------
Wed Jul 29 10:59:21 CEST 2020 - sch...@suse.de
- Removed unneeded AY installation step "autoimage" (bsc#1140711).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20200729/package/skelcd-control-MicroOS.spec
new/skelcd-control-MicroOS-20201117/package/skelcd-control-MicroOS.spec
--- old/skelcd-control-MicroOS-20200729/package/skelcd-control-MicroOS.spec
2020-07-29 14:06:09.000000000 +0200
+++ new/skelcd-control-MicroOS-20201117/package/skelcd-control-MicroOS.spec
2020-11-18 10:18:07.000000000 +0100
@@ -118,7 +118,7 @@
Url: https://github.com/yast/skelcd-control-MicroOS
AutoReqProv: off
-Version: 20200729
+Version: 20201117
Release: 0
Summary: The MicroOS control file needed for installation
License: MIT
@@ -154,12 +154,12 @@
#
# Add control file
#
-mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-install -m 644 control/control.TWMicroOS.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
+mkdir -p %{buildroot}/%{?skelcdpath}/CD1
+install -m 644 control/control.TWMicroOS.xml
%{buildroot}/%{?skelcdpath}/CD1/control.xml
# install LICENSE (required by build service check)
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
-install -m 644 LICENSE $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
+mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
+install -m 644 LICENSE %{buildroot}/%{_defaultdocdir}/%{name}
%files
%defattr(644,root,root,755)
@@ -168,7 +168,7 @@
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%doc %dir %{_prefix}/share/doc/packages/%{name}
-%license %{_prefix}/share/doc/packages/%{name}/LICENSE
+%doc %dir %{_defaultdocdir}/%{name}
+%license %{_defaultdocdir}/%{name}/LICENSE
%changelog
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
