[libvirt] [PATCH] docs: don't install news.rng file

Daniel P. Berrange berrange at redhat.com
Tue Apr 4 17:24:07 UTC 2017


The news.rng file gets picked up by the wildcard match on docs/schemas,
and so gets installed into /usr/share/libvirt, along with the schemas
for our API objects. This then generated an RPM build failure, since
we don't have news.rng in the RPM file list

The news.rng schema is not something that users of libvirt ever care
about, since it is purely an internal thing to validate our website
content.

So rather than add news.rng to the RPM file list, this changes the
make rules so that we don't install news.rng at all.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---

Technically a built-break fix, but I'm not pushing it, in case people
have any alternative suggestions. eg we could just put news.rng in
the tests/ subdirectory instead, letting us keep the wildcard in the
docs/Makefile.am

 docs/Makefile.am | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 62e069e..2251848 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -153,7 +153,30 @@ fig = \
   migration-unmanaged-direct.fig
 
 schemadir = $(pkgdatadir)/schemas
-schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
+schema_DATA = \
+	schemas/basictypes.rng \
+	schemas/capability.rng \
+	schemas/cputypes.rng \
+	schemas/domaincaps.rng \
+	schemas/domaincommon.rng \
+	schemas/domain.rng \
+	schemas/domainsnapshot.rng \
+	schemas/domain.xml \
+	schemas/interface.rng \
+	schemas/networkcommon.rng \
+	schemas/network.rng \
+	schemas/nodedev.rng \
+	schemas/nwfilter.rng \
+	schemas/secret.rng \
+	schemas/storagecommon.rng \
+	schemas/storagepool.rng \
+	schemas/storagevol.rng \
+	$(NULL)
+
+noinst_DATA = \
+	schemas/news.rng \
+	$(NULL)
+
 
 EXTRA_DIST=					\
   apibuild.py genaclperms.pl \
@@ -166,7 +189,7 @@ EXTRA_DIST=					\
   $(internals_html_in) $(internals_html) \
   aclperms.htmlinc \
   hvsupport.pl \
-  $(schema_DATA)
+  $(schema_DATA) $(noinst_DATA)
 
 acl_generated = aclperms.htmlinc
 
-- 
2.9.3




More information about the libvir-list mailing list