[libvirt PATCH] spec: Install all schemas

Jiri Denemark posted 1 patch 3 years, 6 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/47c1f80b918cae7324e31915b44d37dc3175654c.1602137939.git.jdenemar@redhat.com
libvirt.spec.in       | 24 +-----------------------
mingw-libvirt.spec.in | 24 ++----------------------
2 files changed, 3 insertions(+), 45 deletions(-)
[libvirt PATCH] spec: Install all schemas
Posted by Jiri Denemark 3 years, 6 months ago
The main spec file was missing basictypes.rng and mingw does not install
cpu.rng. Let's just install all *.rng files in the schemas directory.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 libvirt.spec.in       | 24 +-----------------------
 mingw-libvirt.spec.in | 24 ++----------------------
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 52f30be096..6d4eef86ad 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1866,29 +1866,7 @@ exit 0
 %dir %{_datadir}/libvirt/schemas/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
 
-%{_datadir}/libvirt/schemas/basictypes.rng
-%{_datadir}/libvirt/schemas/capability.rng
-%{_datadir}/libvirt/schemas/cpu.rng
-%{_datadir}/libvirt/schemas/cputypes.rng
-%{_datadir}/libvirt/schemas/domain.rng
-%{_datadir}/libvirt/schemas/domainbackup.rng
-%{_datadir}/libvirt/schemas/domaincaps.rng
-%{_datadir}/libvirt/schemas/domaincheckpoint.rng
-%{_datadir}/libvirt/schemas/domaincommon.rng
-%{_datadir}/libvirt/schemas/domainsnapshot.rng
-%{_datadir}/libvirt/schemas/interface.rng
-%{_datadir}/libvirt/schemas/network.rng
-%{_datadir}/libvirt/schemas/networkcommon.rng
-%{_datadir}/libvirt/schemas/networkport.rng
-%{_datadir}/libvirt/schemas/nodedev.rng
-%{_datadir}/libvirt/schemas/nwfilter.rng
-%{_datadir}/libvirt/schemas/nwfilter_params.rng
-%{_datadir}/libvirt/schemas/nwfilterbinding.rng
-%{_datadir}/libvirt/schemas/secret.rng
-%{_datadir}/libvirt/schemas/storagecommon.rng
-%{_datadir}/libvirt/schemas/storagepool.rng
-%{_datadir}/libvirt/schemas/storagepoolcaps.rng
-%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/*.rng
 
 %{_datadir}/libvirt/cpu_map/*.xml
 
diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in
index 96c6624ca4..06bb9dfe7f 100644
--- a/mingw-libvirt.spec.in
+++ b/mingw-libvirt.spec.in
@@ -227,28 +227,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 
 %dir %{mingw32_datadir}/libvirt/
 %dir %{mingw32_datadir}/libvirt/schemas/
-%{mingw32_datadir}/libvirt/schemas/basictypes.rng
-%{mingw32_datadir}/libvirt/schemas/capability.rng
-%{mingw32_datadir}/libvirt/schemas/cputypes.rng
-%{mingw32_datadir}/libvirt/schemas/domain.rng
-%{mingw32_datadir}/libvirt/schemas/domainbackup.rng
-%{mingw32_datadir}/libvirt/schemas/domaincaps.rng
-%{mingw32_datadir}/libvirt/schemas/domaincheckpoint.rng
-%{mingw32_datadir}/libvirt/schemas/domaincommon.rng
-%{mingw32_datadir}/libvirt/schemas/domainsnapshot.rng
-%{mingw32_datadir}/libvirt/schemas/interface.rng
-%{mingw32_datadir}/libvirt/schemas/network.rng
-%{mingw32_datadir}/libvirt/schemas/networkcommon.rng
-%{mingw32_datadir}/libvirt/schemas/networkport.rng
-%{mingw32_datadir}/libvirt/schemas/nodedev.rng
-%{mingw32_datadir}/libvirt/schemas/nwfilter.rng
-%{mingw32_datadir}/libvirt/schemas/nwfilter_params.rng
-%{mingw32_datadir}/libvirt/schemas/nwfilterbinding.rng
-%{mingw32_datadir}/libvirt/schemas/secret.rng
-%{mingw32_datadir}/libvirt/schemas/storagecommon.rng
-%{mingw32_datadir}/libvirt/schemas/storagepool.rng
-%{mingw32_datadir}/libvirt/schemas/storagepoolcaps.rng
-%{mingw32_datadir}/libvirt/schemas/storagevol.rng
+%{mingw32_datadir}/libvirt/schemas/*.rng
+
 %dir %{mingw32_datadir}/libvirt/api/
 %{mingw32_datadir}/libvirt/api/libvirt-api.xml
 %{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml
-- 
2.28.0

Re: [libvirt PATCH] spec: Install all schemas
Posted by Peter Krempa 3 years, 6 months ago
On Thu, Oct 08, 2020 at 08:18:59 +0200, Jiri Denemark wrote:
> The main spec file was missing basictypes.rng and mingw does not install
> cpu.rng. Let's just install all *.rng files in the schemas directory.
> 
> Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
> ---
>  libvirt.spec.in       | 24 +-----------------------
>  mingw-libvirt.spec.in | 24 ++----------------------
>  2 files changed, 3 insertions(+), 45 deletions(-)

Reviewed-by: Peter Krempa <pkrempa@redhat.com>