Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2014-10-31 09:39:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2014-09-12 11:19:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2014-10-31 12:26:28.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Oct 16 13:26:13 CEST 2014 - [email protected] + +- Handle btrfs subvolume name '@' as used in SLE12 (bnc#900346) + +------------------------------------------------------------------- +Tue Oct 14 10:34:12 CEST 2014 - [email protected] + +- Include gconv modules for hivex (bnc#900530) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.ua1a0K/_old 2014-10-31 12:26:29.000000000 +0100 +++ /var/tmp/diff_new_pack.ua1a0K/_new 2014-10-31 12:26:29.000000000 +0100 @@ -166,6 +166,7 @@ %endif # %if %{with hivex} +BuildRequires: glibc-locale BuildRequires: hivex-devel %endif # @@ -403,6 +404,7 @@ %if %{with ext4_writeable} BuildRequires: ext4-writeable-kmp-default %endif +BuildRequires: fdupes BuildRequires: file BuildRequires: findutils BuildRequires: gawk ++++++ 0000-hotfix.patch ++++++ --- /var/tmp/diff_new_pack.ua1a0K/_old 2014-10-31 12:26:29.000000000 +0100 +++ /var/tmp/diff_new_pack.ua1a0K/_new 2014-10-31 12:26:29.000000000 +0100 @@ -16,3 +16,15 @@ +++ b/pkg-hotfix.txt @@ -0,0 +1 @@ + +diff --git a/daemon/btrfs.c b/daemon/btrfs.c +index 7a4d43d..ceea593 100644 +--- a/daemon/btrfs.c ++++ b/daemon/btrfs.c +@@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable_t *fs) + ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "subvolume"); + ADD_ARG (argv, i, "list"); ++ ADD_ARG (argv, i, "-o"); + ADD_ARG (argv, i, fs_buf); + ADD_ARG (argv, i, NULL); + ++++++ libguestfs.mkinitrd.setup.sh ++++++ --- /var/tmp/diff_new_pack.ua1a0K/_old 2014-10-31 12:26:29.000000000 +0100 +++ /var/tmp/diff_new_pack.ua1a0K/_new 2014-10-31 12:26:29.000000000 +0100 @@ -2,6 +2,26 @@ #%stage: block # +fdupes_s() { + local _target="" + local _file= + fdupes --quiet --noempty --recurse "$@" | + while read _file + do + if test -z "$_target" + then + _target="$_file" + else + if test -z "$_file" + then + _target="" + continue + fi + echo ln -fv "${_target##*/}" "$_file" + fi + done +} + # copy daemon manually because it is located in RPM_BUILD_ROOT mkdir -vp $tmp_mnt/usr/sbin cp_bin $(type -p guestfsd) $tmp_mnt/usr/sbin @@ -37,6 +57,15 @@ fi done +for d in /usr/lib*/gconv +do + if test -e $d + then + cp -avL --parents $d $tmp_mnt/ + fdupes_s $tmp_mnt$d + fi +done + for t in \ screen \ vt100 \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
