diff --git a/qemu.changes b/qemu.changes index a3af5214..8d8412b0 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 9 15:13:44 UTC 2015 - afaerber@suse.de + +- Enable glusterfs and package as qemu-block-gluster + glusterfs post-v3.5.3 and v3.6.1/v3.6.2 have switched the + glusterfs-api.pc version incompatibly, so only 13.1+13.2 for now +- Use macro for module Conflicts + ------------------------------------------------------------------- Thu Apr 9 12:21:07 UTC 2015 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 931ee9e0..4f941c3a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -126,7 +126,7 @@ BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 BuildRequires: glusterfs-devel %endif %if 0%{?suse_version} >= 1220 @@ -184,6 +184,7 @@ BuildRequires: makeinfo %endif BuildRequires: mozilla-nss-devel BuildRequires: ncurses-devel +BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: python %if 0%{?suse_version} >= 1310 @@ -373,15 +374,22 @@ as PC and PowerMac systems. This sub-package contains translations. +# Modules need to match {qemu-system-*,qemu-img} version. +# We cannot have qemu and qemu-tools require them in the right version, +# as that would drag in the dependencies the modules are supposed to avoid. +# Nor can we have modules require the right version of qemu and qemu-tools +# as Xen reuses our qemu-tools but does not want our qemu and qemu-x86. +%define qemu_module_conflicts \ +Conflicts: qemu < %version \ +Conflicts: qemu > %version \ +Conflicts: qemu-tools < %version \ +Conflicts: qemu-tools > %version + %package block-curl Summary: Universal CPU emulator -- cURL block support Group: System/Emulators/PC Provides: qemu:%_libdir/%name/block-curl.so -# Needs to match {qemu-system-*,qemu-img} >= 2.0.0, but is optional. -Conflicts: qemu < %version -Conflicts: qemu > %version -Conflicts: qemu-tools < %version -Conflicts: qemu-tools > %version +%{qemu_module_conflicts} %description block-curl QEMU is an extremely well-performing CPU emulator that allows you to @@ -393,15 +401,28 @@ as PC and PowerMac systems. This sub-package contains a module for accessing network-based image files over a network connection from qemu-img tool and QEMU system emulation. +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 +%package block-gluster +Summary: Universal CPU emulator -- GlusterFS block support +Group: System/Emulators/PC +%{qemu_module_conflicts} + +%description block-gluster +QEMU is an extremely well-performing CPU emulator that allows you to +choose between simulating an entire system and running userspace +binaries for different architectures under your native operating +system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well +as PC and PowerMac systems. + +This sub-package contains a module for accessing network-based image files +over a GlusterFS network connection from qemu-img tool and QEMU system emulation. +%endif + %if 0%{?suse_version} > 1140 %package block-ssh Summary: Universal CPU emulator -- SSH block support Group: System/Emulators/PC -# Needs to match {qemu-system-*,qemu-img} >= 2.0.0, but is optional. -Conflicts: qemu < %version -Conflicts: qemu > %version -Conflicts: qemu-tools < %version -Conflicts: qemu-tools > %version +%{qemu_module_conflicts} %description block-ssh QEMU is an extremely well-performing CPU emulator that allows you to @@ -597,8 +618,8 @@ done --enable-curl \ --enable-curses \ --enable-fdt \ -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 - --disable-glusterfs \ +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 + --enable-glusterfs \ %endif --enable-gtk \ %if 0%{?suse_version} >= 1220 @@ -877,6 +898,12 @@ fi %defattr(-, root, root) %_libdir/%name/block-curl.so +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 +%files block-gluster +%defattr(-, root, root) +%_libdir/%name/block-gluster.so +%endif + %if 0%{?suse_version} > 1140 %files block-ssh %defattr(-, root, root) diff --git a/qemu.spec.in b/qemu.spec.in index 89125bb0..316e2774 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -89,7 +89,7 @@ BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 BuildRequires: glusterfs-devel %endif %if 0%{?suse_version} >= 1220 @@ -147,6 +147,7 @@ BuildRequires: makeinfo %endif BuildRequires: mozilla-nss-devel BuildRequires: ncurses-devel +BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: python %if 0%{?suse_version} >= 1310 @@ -336,15 +337,22 @@ as PC and PowerMac systems. This sub-package contains translations. +# Modules need to match {qemu-system-*,qemu-img} version. +# We cannot have qemu and qemu-tools require them in the right version, +# as that would drag in the dependencies the modules are supposed to avoid. +# Nor can we have modules require the right version of qemu and qemu-tools +# as Xen reuses our qemu-tools but does not want our qemu and qemu-x86. +%define qemu_module_conflicts \ +Conflicts: qemu < %version \ +Conflicts: qemu > %version \ +Conflicts: qemu-tools < %version \ +Conflicts: qemu-tools > %version + %package block-curl Summary: Universal CPU emulator -- cURL block support Group: System/Emulators/PC Provides: qemu:%_libdir/%name/block-curl.so -# Needs to match {qemu-system-*,qemu-img} >= 2.0.0, but is optional. -Conflicts: qemu < %version -Conflicts: qemu > %version -Conflicts: qemu-tools < %version -Conflicts: qemu-tools > %version +%{qemu_module_conflicts} %description block-curl QEMU is an extremely well-performing CPU emulator that allows you to @@ -356,15 +364,28 @@ as PC and PowerMac systems. This sub-package contains a module for accessing network-based image files over a network connection from qemu-img tool and QEMU system emulation. +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 +%package block-gluster +Summary: Universal CPU emulator -- GlusterFS block support +Group: System/Emulators/PC +%{qemu_module_conflicts} + +%description block-gluster +QEMU is an extremely well-performing CPU emulator that allows you to +choose between simulating an entire system and running userspace +binaries for different architectures under your native operating +system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well +as PC and PowerMac systems. + +This sub-package contains a module for accessing network-based image files +over a GlusterFS network connection from qemu-img tool and QEMU system emulation. +%endif + %if 0%{?suse_version} > 1140 %package block-ssh Summary: Universal CPU emulator -- SSH block support Group: System/Emulators/PC -# Needs to match {qemu-system-*,qemu-img} >= 2.0.0, but is optional. -Conflicts: qemu < %version -Conflicts: qemu > %version -Conflicts: qemu-tools < %version -Conflicts: qemu-tools > %version +%{qemu_module_conflicts} %description block-ssh QEMU is an extremely well-performing CPU emulator that allows you to @@ -523,8 +544,8 @@ done --enable-curl \ --enable-curses \ --enable-fdt \ -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 - --disable-glusterfs \ +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 + --enable-glusterfs \ %endif --enable-gtk \ %if 0%{?suse_version} >= 1220 @@ -803,6 +824,12 @@ fi %defattr(-, root, root) %_libdir/%name/block-curl.so +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 +%files block-gluster +%defattr(-, root, root) +%_libdir/%name/block-gluster.so +%endif + %if 0%{?suse_version} > 1140 %files block-ssh %defattr(-, root, root)