From e74a18772597a12eb0627f5f1a421cd6b38388c2bab3446318b468f9512a45b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 22 Nov 2017 16:23:43 +0000 Subject: [PATCH 1/7] - Add db48-utils dependency: needed to inspect the installed packages. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=413 --- libguestfs.changes | 6 ++++++ libguestfs.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index fe2540b..dac2485 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 22 16:22:39 UTC 2017 - cbosdonnat@suse.com + +- Add db48-utils dependency: needed to inspect the installed + packages. + ------------------------------------------------------------------- Wed Oct 25 13:24:50 UTC 2017 - cbosdonnat@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 83ca68e..99e9155 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -441,7 +441,7 @@ Recommends: parted Recommends: zerofree Recommends: genisoimage Recommends: ldmtool -%if %{?is_opensuse:0} == 0 +%if 0%{?is_opensuse:0} == 0 Recommends: guestfs-winsupport %endif @@ -489,6 +489,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 @@ -664,7 +665,7 @@ touch %{name}.lang %fdupes -s %{buildroot}/ # Appliance NTFS files -%if %{?is_opensuse} +%if 0%{?is_opensuse} == 0 mkdir -p %{buildroot}/tmp/etc/alternatives pushd %{buildroot}/tmp/etc/alternatives ln -s /sbin/mount.ntfs-3g mount.ntfs @@ -723,7 +724,7 @@ 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} == 0 %{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz %endif From b4a9c7b26f44a9d4f4aae9433f50c3e44f518d57c9aaa4badf8f3de45110f8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Thu, 30 Nov 2017 10:54:44 +0000 Subject: [PATCH 2/7] Accepting request 546686 from home:cbosdonnat:branches:Virtualization Fix is_opensuse macro mess in spec file OBS-URL: https://build.opensuse.org/request/show/546686 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=414 --- 0000-hotfix.patch | 0 libguestfs.spec | 15 ++++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 0000-hotfix.patch diff --git a/0000-hotfix.patch b/0000-hotfix.patch deleted file mode 100644 index 473a0f4..0000000 diff --git a/libguestfs.spec b/libguestfs.spec index 99e9155..03b7d9a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -137,10 +137,9 @@ BuildRequires: gtk2-devel Url: http://libguestfs.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools +# PATCH-FIX-UPSTREAM - python3 fixes 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 # PATCH-FIX-UPSTREAM - add configure --with-distro parameter @@ -441,7 +440,7 @@ Recommends: parted Recommends: zerofree Recommends: genisoimage Recommends: ldmtool -%if 0%{?is_opensuse:0} == 0 +%if ! 0%{?is_opensuse} Recommends: guestfs-winsupport %endif @@ -455,7 +454,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+ @@ -544,7 +543,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 @@ -665,7 +663,7 @@ touch %{name}.lang %fdupes -s %{buildroot}/ # Appliance NTFS files -%if 0%{?is_opensuse} == 0 +%if 0%{?is_opensuse} mkdir -p %{buildroot}/tmp/etc/alternatives pushd %{buildroot}/tmp/etc/alternatives ln -s /sbin/mount.ntfs-3g mount.ntfs @@ -724,11 +722,10 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %{_libdir}/guestfs/supermin.d/packages %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz -%if 0%{?is_opensuse} == 0 +%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* From 3cb4b5ef3cfd83a011ad5aa36a2fe42928eff669db32d6524d97891a880aeb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Thu, 30 Nov 2017 13:08:00 +0000 Subject: [PATCH 3/7] - Remove useless patch: 0000-hotfix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=415 --- libguestfs.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libguestfs.changes b/libguestfs.changes index dac2485..c2c27d8 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -3,6 +3,7 @@ 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 From 970ea4d7bdc9c02d82ae9c0de4d264ce08b42f1f1039eba1cdacc672ded3dbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Mon, 4 Dec 2017 17:20:49 +0000 Subject: [PATCH 4/7] Accepting request 548191 from home:cbosdonnat:branches:Virtualization - evtxdump is in python3-evtx, drop python2 dependency (fate#323526) OBS-URL: https://build.opensuse.org/request/show/548191 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=416 --- libguestfs.changes | 6 ++++++ libguestfs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index c2c27d8..854a15d 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 4 17:18:57 UTC 2017 - cbosdonnat@suse.com + +- evtxdump is in python3-evtx, drop python2 dependency + (fate#323526) + ------------------------------------------------------------------- Wed Nov 22 16:22:39 UTC 2017 - cbosdonnat@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 03b7d9a..21a8161 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -175,7 +175,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 From b51803f5d78c3fb04d6c95dac7a050b7614fc8b3c973b368e6c896a60eb6bfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Tue, 5 Dec 2017 10:09:16 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=417 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 21a8161..8b09daf 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -137,9 +137,9 @@ BuildRequires: gtk2-devel Url: http://libguestfs.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools -# PATCH-FIX-UPSTREAM - python3 fixes License: GPL-2.0 Group: System/Filesystems +# 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 # PATCH-FIX-UPSTREAM - add configure --with-distro parameter From 04b6f777c5ffaa4694d72083c0c2c5f137f86ff3aae93f7af69c14759ccb6832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Tue, 5 Dec 2017 15:32:05 +0000 Subject: [PATCH 6/7] Accepting request 554551 from home:cbosdonnat:branches:Virtualization - add hwinfo to the appliance packages for ntfs support. (bsc#1070976) OBS-URL: https://build.opensuse.org/request/show/554551 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=418 --- libguestfs.changes | 2 ++ libguestfs.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 854a15d..15dbc01 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -3,6 +3,8 @@ 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) ------------------------------------------------------------------- Wed Nov 22 16:22:39 UTC 2017 - cbosdonnat@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 8b09daf..0727044 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -686,7 +686,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 From c3c36fd757c37019f59154646d5c88f7c64dababfaf32ffc4f0f6f65b49e2d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 6 Dec 2017 15:46:58 +0000 Subject: [PATCH 7/7] Accepting request 554861 from home:cbosdonnat:branches:Virtualization - Don't run fdupes as it symlinks some of the python3 binding files to their python2 equivalent OBS-URL: https://build.opensuse.org/request/show/554861 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=419 --- libguestfs.changes | 2 ++ libguestfs.spec | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index 15dbc01..778fcbe 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -5,6 +5,8 @@ Mon Dec 4 17:18:57 UTC 2017 - cbosdonnat@suse.com (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 diff --git a/libguestfs.spec b/libguestfs.spec index 0727044..d1f656d 100644 --- a/libguestfs.spec +++ b/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 @@ -660,7 +659,6 @@ rm -fv %{buildroot}/%{_libdir}/*.a # touch %{name}.lang %find_lang %{name} -%fdupes -s %{buildroot}/ # Appliance NTFS files %if 0%{?is_opensuse}