docs/schemas directory is meant for schemas which are installed on the
system. The schema for the news file does not need to be installed.
Store it along with the file it describes for simplicity.
---
Patch for the alternative of moving news rng to docs/ along with the file it
should describe.

 docs/{schemas => }/news.rng | 0
 docs/news.xml               | 2 +-
 tests/virschematest.c       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename docs/{schemas => }/news.rng (100%)

diff --git a/docs/schemas/news.rng b/docs/news.rng
similarity index 100%
rename from docs/schemas/news.rng
rename to docs/news.rng
diff --git a/docs/news.xml b/docs/news.xml
index 9c0dcfd23..2a15b1236 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -17,7 +17,7 @@

      Lines should be kept under 80 columns, and should not exceed 100 columns.

-     This file is validated against docs/schemas/news.rng schema.
+     This file is validated against docs/news.rng schema.

      Use the following template to add a new release section:

diff --git a/tests/virschematest.c b/tests/virschematest.c
index 1f990f7cd..119d4ba39 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -236,7 +236,7 @@ mymain(void)
     DO_TEST_DIR("storagevol.rng", "storagevolxml2xmlin", "storagevolxml2xmlout",
                 "storagevolschemadata");

-    DO_TEST_FILE("news.rng", "../docs/news.xml");
+    DO_TEST_FILE("../news.rng", "../docs/news.xml");

     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-- 
2.12.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Wed, Apr 05, 2017 at 09:56:13AM +0200, Peter Krempa wrote:
> docs/schemas directory is meant for schemas which are installed on the
> system. The schema for the news file does not need to be installed.
> Store it along with the file it describes for simplicity.
> ---
> Patch for the alternative of moving news rng to docs/ along with the file it
> should describe.
> 
>  docs/{schemas => }/news.rng | 0
>  docs/news.xml               | 2 +-
>  tests/virschematest.c       | 2 +-
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename docs/{schemas => }/news.rng (100%)

ACK,

Lets do this instead of my patch.


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://entangle-photo.org       -o-    http://search.cpan.org/~danberr/ :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Wed, Apr 05, 2017 at 09:13:00 +0100, Daniel Berrange wrote:
> On Wed, Apr 05, 2017 at 09:56:13AM +0200, Peter Krempa wrote:
> > docs/schemas directory is meant for schemas which are installed on the
> > system. The schema for the news file does not need to be installed.
> > Store it along with the file it describes for simplicity.
> > ---
> > Patch for the alternative of moving news rng to docs/ along with the file it
> > should describe.
> > 
> >  docs/{schemas => }/news.rng | 0
> >  docs/news.xml               | 2 +-
> >  tests/virschematest.c       | 2 +-
> >  3 files changed, 2 insertions(+), 2 deletions(-)
> >  rename docs/{schemas => }/news.rng (100%)
> 
> ACK,
> 
> Lets do this instead of my patch.

Pushed; thanks. Sorry for not noticing that it would get installed.

Peter
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list