Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory
checked in at 2021-07-29 21:31:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Thu Jul 29 21:31:02 2021 rev:124 rq:908358 version:4.4.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2021-07-16 22:13:15.538611085 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1899/libstorage-ng.changes
2021-07-29 21:31:30.276805007 +0200
@@ -1,0 +2,17 @@
+Mon Jul 26 08:28:18 UTC 2021 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#824
+- added notes
+- 4.4.30
+
+--------------------------------------------------------------------
+Fri Jul 23 14:23:22 UTC 2021 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#823
+- extended spec file for Fedora
+- added documentation
+- avoid non standard parted commands where possible
+- coding style
+- 4.4.29
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.4.28.tar.xz
New:
----
libstorage-ng-4.4.30.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.jvLwLB/_old 2021-07-29 21:31:31.176803899 +0200
+++ /var/tmp/diff_new_pack.jvLwLB/_new 2021-07-29 21:31:31.176803899 +0200
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.4.28
+Version: 4.4.30
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
@@ -49,9 +49,16 @@
%if 0%{?fedora}
BuildRequires: rubygem-test-unit
%endif
-BuildRequires: libjson-c-devel
BuildRequires: swig >= 3.0.3
BuildRequires: pkgconfig(libxml-2.0)
+%if 0%{?fedora}
+BuildRequires: glibc-langpack-de
+BuildRequires: glibc-langpack-en
+BuildRequires: glibc-langpack-fr
+BuildRequires: json-c-devel
+%else
+BuildRequires: libjson-c-devel
+%endif
BuildRequires: pkgconfig(python3)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -153,8 +160,8 @@
export CXXFLAGS="%{optflags} -DNDEBUG"
autoreconf -fvi
-
%configure \
+ --docdir="%{_docdir}/%{name}" \
--disable-static \
--disable-silent-rules
make %{?_smp_mflags}
@@ -183,8 +190,9 @@
%files -n %{libname}
%defattr(-,root,root)
-%doc AUTHORS
-%license LICENSE
+%doc %dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/AUTHORS
+%license %{_docdir}/%{name}/LICENSE
%{_libdir}/libstorage-ng.so.*
%ghost /run/libstorage-ng
@@ -192,17 +200,25 @@
%defattr(-,root,root)
%{_libdir}/libstorage-ng.so
%{_includedir}/storage
-%dir %{_docdir}/%{name}/
-%doc %{_docdir}/%{name}/*
+%dir %{_docdir}/%{name}/autodocs
+%doc %{_docdir}/%{name}/autodocs/*
%files python3
%defattr(-,root,root)
%{python3_sitelib}/storage.py*
%attr(755,root,root) %{python3_sitearch}/_storage.so
+# Fedora has brp-python-bytecompile so apparently they want those packaged
+%if 0%{?fedora}
+%{python3_sitelib}/__pycache__/storage*.pyc
+%endif
%files ruby
%defattr(-,root,root)
-%{rb_vendorarch}/storage.so
+%if 0%{?fedora}
+%{ruby_vendorarchdir}/storage.so
+%else
+%{rb_vendorarchdir}/storage.so
+%endif
%files utils
%defattr(-,root,root)
++++++ libstorage-ng-4.4.28.tar.xz -> libstorage-ng-4.4.30.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.28/LIBVERSION
new/libstorage-ng-4.4.30/LIBVERSION
--- old/libstorage-ng-4.4.28/LIBVERSION 2021-07-14 23:10:58.000000000 +0200
+++ new/libstorage-ng-4.4.30/LIBVERSION 2021-07-26 10:28:18.000000000 +0200
@@ -1 +1 @@
-1.58.0
+1.58.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.28/VERSION
new/libstorage-ng-4.4.30/VERSION
--- old/libstorage-ng-4.4.28/VERSION 2021-07-14 23:10:58.000000000 +0200
+++ new/libstorage-ng-4.4.30/VERSION 2021-07-26 10:28:18.000000000 +0200
@@ -1 +1 @@
-4.4.28
+4.4.30
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.28/configure.ac
new/libstorage-ng-4.4.30/configure.ac
--- old/libstorage-ng-4.4.28/configure.ac 2021-07-14 23:10:58.000000000
+0200
+++ new/libstorage-ng-4.4.30/configure.ac 2021-07-26 10:28:18.000000000
+0200
@@ -52,10 +52,6 @@
AC_SUBST(LIBVERSION_PATCHLEVEL)
AC_SUBST(LIBVERSION_INFO)
-docdir=\${prefix}/share/doc/packages/libstorage-ng
-
-AC_SUBST(docdir)
-
PYTHON_CONFIG=${PYTHON_CONFIG:-python3-config}
PYTHON_INCLUDES=$($PYTHON_CONFIG --includes)
PYTHON_LIBS=$($PYTHON_CONFIG --libs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.28/libstorage-ng.spec.in
new/libstorage-ng-4.4.30/libstorage-ng.spec.in
--- old/libstorage-ng-4.4.28/libstorage-ng.spec.in 2021-07-14
23:10:58.000000000 +0200
+++ new/libstorage-ng-4.4.30/libstorage-ng.spec.in 2021-07-26
10:28:18.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libstorage-ng
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -51,7 +51,14 @@
%endif
BuildRequires: swig >= 3.0.3
BuildRequires: pkgconfig(libxml-2.0)
+%if 0%{?fedora}
+BuildRequires: json-c-devel
+BuildRequires: glibc-langpack-de
+BuildRequires: glibc-langpack-fr
+BuildRequires: glibc-langpack-en
+%else
BuildRequires: libjson-c-devel
+%endif
BuildRequires: pkgconfig(python3)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -153,8 +160,8 @@
export CXXFLAGS="%{optflags} -DNDEBUG"
autoreconf -fvi
-
%configure \
+ --docdir="%{_docdir}/%{name}" \
--disable-static \
--disable-silent-rules
make %{?_smp_mflags}
@@ -183,8 +190,9 @@
%files -n %{libname}
%defattr(-,root,root)
-%doc AUTHORS
-%license LICENSE
+%doc %dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/AUTHORS
+%license %{_docdir}/%{name}/LICENSE
%{_libdir}/libstorage-ng.so.*
%ghost /run/libstorage-ng
@@ -192,17 +200,25 @@
%defattr(-,root,root)
%{_libdir}/libstorage-ng.so
%{_includedir}/storage
-%dir %{_docdir}/%{name}/
-%doc %{_docdir}/%{name}/*
+%dir %{_docdir}/%{name}/autodocs
+%doc %{_docdir}/%{name}/autodocs/*
%files python3
%defattr(-,root,root)
%{python3_sitelib}/storage.py*
%attr(755,root,root) %{python3_sitearch}/_storage.so
+# Fedora has brp-python-bytecompile so apparently they want those packaged
+%if 0%{?fedora}
+%{python3_sitelib}/__pycache__/storage*.pyc
+%endif
%files ruby
%defattr(-,root,root)
-%{rb_vendorarch}/storage.so
+%if 0%{?fedora}
+%{ruby_vendorarchdir}/storage.so
+%else
+%{rb_vendorarchdir}/storage.so
+%endif
%files utils
%defattr(-,root,root)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.28/storage/Devices/PartitionImpl.cc
new/libstorage-ng-4.4.30/storage/Devices/PartitionImpl.cc
--- old/libstorage-ng-4.4.28/storage/Devices/PartitionImpl.cc 2021-07-14
23:10:58.000000000 +0200
+++ new/libstorage-ng-4.4.30/storage/Devices/PartitionImpl.cc 2021-07-26
10:28:18.000000000 +0200
@@ -768,6 +768,8 @@
const Partitionable* partitionable = get_partitionable();
const PartitionTable* partition_table = get_partition_table();
+ // Note: --wipesignatures is not available in upstream parted
(2021-07-26).
+
string cmd_line = PARTED_BIN " --script --wipesignatures " +
quote(partitionable->get_name()) +
" unit s mkpart ";
@@ -901,61 +903,65 @@
string cmd_line = PARTED_BIN " --script " +
quote(partitionable->get_name()) + " set " +
to_string(get_number()) + " ";
- if (is_msdos(partition_table))
- {
- // Note: The type option is not available in upstream parted.
+ // Note: The 'type' option is not available in upstream parted
(2021-07-26).
+ // 'swap' is not available for MS-DOS in parted (2021-07-26).
- cmd_line += "type " + to_string(get_id());
- }
- else
+ switch (get_id())
{
- switch (get_id())
- {
- case ID_LINUX:
- // this is tricky but parted has no clearer way
- cmd_line += "lvm on set " + to_string(get_number()) + " lvm
off";
- break;
+ case ID_LINUX:
+ // this is tricky but parted has no clearer way
+ cmd_line += "lvm on set " + to_string(get_number()) + " lvm
off";
+ break;
- case ID_SWAP:
+ case ID_SWAP:
+ if (!is_msdos(partition_table))
cmd_line += "swap on";
- break;
+ else
+ cmd_line += "type 130";
+ break;
- case ID_LVM:
- cmd_line += "lvm on";
- break;
+ case ID_LVM:
+ cmd_line += "lvm on";
+ break;
- case ID_RAID:
- cmd_line += "raid on";
- break;
+ case ID_RAID:
+ cmd_line += "raid on";
+ break;
- case ID_IRST:
- cmd_line += "irst on";
- break;
+ case ID_IRST:
+ cmd_line += "irst on";
+ break;
- case ID_ESP:
- cmd_line += "esp on";
- break;
+ case ID_ESP:
+ cmd_line += "esp on";
+ break;
- case ID_BIOS_BOOT:
- cmd_line += "bios_grub on";
- break;
+ case ID_BIOS_BOOT:
+ cmd_line += "bios_grub on";
+ break;
- case ID_PREP:
- cmd_line += "prep on";
- break;
+ case ID_PREP:
+ cmd_line += "prep on";
+ break;
- case ID_WINDOWS_BASIC_DATA:
- cmd_line += "msftdata";
- break;
+ case ID_WINDOWS_BASIC_DATA:
+ cmd_line += "msftdata";
+ break;
- case ID_MICROSOFT_RESERVED:
- cmd_line += "msftres";
- break;
+ case ID_MICROSOFT_RESERVED:
+ cmd_line += "msftres";
+ break;
- case ID_DIAG:
- cmd_line += "diag";
- break;
- }
+ case ID_DIAG:
+ cmd_line += "diag";
+ break;
+
+ default:
+ if (is_msdos(partition_table))
+ cmd_line += "type " + to_string(get_id());
+ else
+ ST_THROW(Exception("impossible to set partition id"));
+ break;
}
SystemCmd cmd(cmd_line, SystemCmd::DoThrow);
@@ -1224,6 +1230,8 @@
const Partition* partition_rhs =
to_partition(action->get_device(commit_data.actiongraph, RHS));
const Partitionable* partitionable = get_partitionable();
+ // Note: --ignore-busy is not available in upstream parted (2021-07-26).
+
string cmd_line = PARTED_BIN " --script --ignore-busy " +
quote(partitionable->get_name()) +
" unit s resizepart " + to_string(get_number()) + " ";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.28/storage/Devices/PartitionTable.h
new/libstorage-ng-4.4.30/storage/Devices/PartitionTable.h
--- old/libstorage-ng-4.4.28/storage/Devices/PartitionTable.h 2021-07-14
23:10:58.000000000 +0200
+++ new/libstorage-ng-4.4.30/storage/Devices/PartitionTable.h 2021-07-26
10:28:18.000000000 +0200
@@ -195,6 +195,10 @@
/**
* Returns whether the partition id is supported on the partition table.
+ *
+ * This function does not consider the partition type (primary,
extended or
+ * logical) so further restriction may apply, e.g. ID_EXTENDED is not
allowed for
+ * primary partitions.
*/
bool is_partition_id_supported(unsigned int id) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.28/storage/Filesystems/BlkFilesystemImpl.cc
new/libstorage-ng-4.4.30/storage/Filesystems/BlkFilesystemImpl.cc
--- old/libstorage-ng-4.4.28/storage/Filesystems/BlkFilesystemImpl.cc
2021-07-14 23:10:58.000000000 +0200
+++ new/libstorage-ng-4.4.30/storage/Filesystems/BlkFilesystemImpl.cc
2021-07-26 10:28:18.000000000 +0200
@@ -192,13 +192,12 @@
continue;
}
+ // btrfs is probed independently in probe_btrfses().
+ if (it->second.fs_type == FsType::BTRFS &&
support_btrfs_multiple_devices())
+ continue;
+
try
{
- // btrfs is probed independently in probe_btrfses().
-
- if (support_btrfs_multiple_devices() && it->second.fs_type ==
FsType::BTRFS)
- continue;
-
BlkFilesystem* blk_filesystem =
blk_device->create_blk_filesystem(it->second.fs_type);
blk_filesystem->get_impl().probe_pass_2a(prober);
blk_filesystem->get_impl().probe_pass_2b(prober);
