From nobody Sun May 5 12:12:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 14913266618881006.0734875906268; Tue, 4 Apr 2017 10:24:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B529D1B18; Tue, 4 Apr 2017 17:24:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00ADB77FEB; Tue, 4 Apr 2017 17:24:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3A4B75EC64; Tue, 4 Apr 2017 17:24:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v34HOETe017448 for ; Tue, 4 Apr 2017 13:24:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id E437F17C34; Tue, 4 Apr 2017 17:24:14 +0000 (UTC) Received: from dhcp-17-113.lcy.redhat.com (unknown [10.42.17.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 633CD77FF3; Tue, 4 Apr 2017 17:24:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B529D1B18 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B529D1B18 From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Tue, 4 Apr 2017 18:24:07 +0100 Message-Id: <20170404172407.10529-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] docs: don't install news.rng file X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 04 Apr 2017 17:24:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 --- 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 =3D \ migration-unmanaged-direct.fig =20 schemadir =3D $(pkgdatadir)/schemas -schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) +schema_DATA =3D \ + 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 =3D \ + schemas/news.rng \ + $(NULL) + =20 EXTRA_DIST=3D \ apibuild.py genaclperms.pl \ @@ -166,7 +189,7 @@ EXTRA_DIST=3D \ $(internals_html_in) $(internals_html) \ aclperms.htmlinc \ hvsupport.pl \ - $(schema_DATA) + $(schema_DATA) $(noinst_DATA) =20 acl_generated =3D aclperms.htmlinc =20 --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list