Accepting request 554862 from Virtualization

- evtxdump is in python3-evtx, drop python2 dependency
  (fate#323526)
- add hwinfo to the appliance packages for ntfs support.
  (bsc#1070976)
- Don't run fdupes as it symlinks some of the python3 binding
  files to their python2 equivalent

- Add db48-utils dependency: needed to inspect the installed
  packages.
- Remove useless patch: 0000-hotfix.patch

OBS-URL: https://build.opensuse.org/request/show/554862
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=58

libguestfs.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Dec  4 17:18:57 UTC 2017 - cbosdonnat@suse.com
+
+- evtxdump is in python3-evtx, drop python2 dependency
+  (fate#323526)
+- add hwinfo to the appliance packages for ntfs support.
+  (bsc#1070976)
+- Don't run fdupes as it symlinks some of the python3 binding
+  files to their python2 equivalent
+
+-------------------------------------------------------------------
+Wed Nov 22 16:22:39 UTC 2017 - cbosdonnat@suse.com
+
+- Add db48-utils dependency: needed to inspect the installed
+  packages.
+- Remove useless patch: 0000-hotfix.patch
+
 -------------------------------------------------------------------
 Wed Oct 25 13:24:50 UTC 2017 - cbosdonnat@suse.com
 

libguestfs.spec

@@ -82,7 +82,6 @@ BuildRequires:  bash-completion-devel >= 2.0
 %endif
 %endif
 BuildRequires:  bison
-BuildRequires:  fdupes
 BuildRequires:  file-devel
 BuildRequires:  flex
 BuildRequires:  gcc
@@ -139,7 +138,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
 License:        GPL-2.0
 Group:          System/Filesystems
-Patch0:         0000-hotfix.patch
 # PATCH-FIX-UPSTREAM - python3 fixes
 Patch1:         9d25b4e5-python-add-simple-wrappers-for-PyObject-string-funct.patch
 Patch2:         f3f99a09-python-use-right-func-when-PyString_FromStringAndSiz.patch
@@ -176,7 +174,7 @@ Group:          System/Filesystems
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
 Requires:       libguestfs0 = %{version}
-Requires:       python-evtx
+Requires:       python3-evtx
 %if %{with bash_completion}
 Recommends:     bash-completion >= 2.0
 %endif
@@ -441,7 +439,7 @@ Recommends:     parted
 Recommends:     zerofree
 Recommends:     genisoimage
 Recommends:     ldmtool
-%if %{?is_opensuse:0} == 0
+%if ! 0%{?is_opensuse}
 Recommends:     guestfs-winsupport
 %endif
 
@@ -455,7 +453,7 @@ Obsoletes:      libguestfs-data < %{version}
 libguestfs needs for it's run a virtual machine image.
 This package provides such an image, an initrd and a kernel.
 
-%if 0%{?is_opensuse} == 0
+%if ! 0%{?is_opensuse}
 %package -n guestfs-winsupport
 Summary:        Windows guest support in libguestfs
 License:        GPL-2.0+
@@ -489,6 +487,7 @@ Summary:        Runtime library of libguestfs
 License:        LGPL-2.1
 Group:          System/Libraries
 Requires:       %{kvm_binary}
+Requires:       db48-utils
 Requires:       guestfs-data >= %{version}
 Requires:       qemu >= 2.0
 Requires:       qemu-tools
@@ -543,7 +542,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
 %prep
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -661,10 +659,9 @@ rm -fv %{buildroot}/%{_libdir}/*.a
 #
 touch %{name}.lang
 %find_lang %{name}
-%fdupes -s %{buildroot}/
 
 # Appliance NTFS files
-%if %{?is_opensuse}
+%if 0%{?is_opensuse}
 mkdir -p %{buildroot}/tmp/etc/alternatives
 pushd %{buildroot}/tmp/etc/alternatives
 ln -s /sbin/mount.ntfs-3g mount.ntfs
@@ -687,7 +684,10 @@ pushd winsupport
 tar zcf %{buildroot}%{_libdir}/guestfs/supermin.d/zz-winsupport.tar.gz .
 popd
 
-echo "libfuse2" > %{buildroot}%{_libdir}/guestfs/supermin.d/zz-packages-winsupport
+cat > %{buildroot}%{_libdir}/guestfs/supermin.d/zz-packages-winsupport << EOF
+libfuse2
+hwinfo
+EOF
 %endif
 
 mkdir -p %{buildroot}/tmp/usr/bin
@@ -723,11 +723,10 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in
 %{_libdir}/guestfs/supermin.d/packages
 %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz
 
-%if %{?is_opensuse}
+%if 0%{?is_opensuse}
 %{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz
-%endif
+%else
 
-%if 0%{?is_opensuse} == 0
 %files -n guestfs-winsupport
 %defattr(-,root,root)
 %{_libdir}/guestfs/supermin.d/zz-*winsupport*