Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- configure.ac | 1 + data/oses/Makefile.am | 2 +- data/oses/netware.xml.in | 29 ----------------------------- data/oses/novell.com/Makefile.am | 1 + data/oses/novell.com/netware-4.xml.in | 10 ++++++++++ data/oses/novell.com/netware-5.xml.in | 10 ++++++++++ data/oses/novell.com/netware-6.xml.in | 10 ++++++++++ po/POTFILES.in | 4 +++- 8 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 data/oses/netware.xml.in create mode 100644 data/oses/novell.com/Makefile.am create mode 100644 data/oses/novell.com/netware-4.xml.in create mode 100644 data/oses/novell.com/netware-5.xml.in create mode 100644 data/oses/novell.com/netware-6.xml.in diff --git a/configure.ac b/configure.ac index d2cbc10..44813c0 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,7 @@ AC_CONFIG_FILES([ data/oses/mandriva.com/Makefile data/oses/microsoft.com/Makefile data/oses/netbsd.org/Makefile + data/oses/novell.com/Makefile data/schemas/Makefile tools/Makefile test/Makefile diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index bd7cf3a..9fd75f5 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -11,11 +11,11 @@ SUBDIRS = \ mandriva.com \ microsoft.com \ netbsd.org \ + novell.com \ $(NULL) databasedir = $(pkgdatadir)/db/oses/ database_in_files = \ - netware.xml.in \ openbsd.xml.in \ opensuse.xml.in \ rhl.xml.in \ diff --git a/data/oses/netware.xml.in b/data/oses/netware.xml.in deleted file mode 100644 index 35f0958..0000000 --- a/data/oses/netware.xml.in +++ /dev/null @@ -1,29 +0,0 @@ -<libosinfo version="0.0.1"> - <os id="http://novell.com/netware/4";> - <short-id>netware4</short-id> - <_name>Novell Netware 4</_name> - <_vendor>Novell</_vendor> - <family>netware</family> - <distro>netware</distro> - <version>4</version> - </os> - - <os id="http://novell.com/netware/5";> - <short-id>netware5</short-id> - <_name>Novell Netware 5</_name> - <_vendor>Novell</_vendor> - <family>netware</family> - <distro>netware</distro> - <version>5</version> - </os> - - <os id="http://novell.com/netware/6";> - <short-id>netware6</short-id> - <_name>Novell Netware 6</_name> - <_vendor>Novell</_vendor> - <family>netware</family> - <distro>netware</distro> - <version>6</version> - </os> - -</libosinfo> diff --git a/data/oses/novell.com/Makefile.am b/data/oses/novell.com/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/novell.com/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/novell.com/netware-4.xml.in b/data/oses/novell.com/netware-4.xml.in new file mode 100644 index 0000000..6567a8b --- /dev/null +++ b/data/oses/novell.com/netware-4.xml.in @@ -0,0 +1,10 @@ +<libosinfo version="0.0.1"> + <os id="http://novell.com/netware/4";> + <short-id>netware4</short-id> + <_name>Novell Netware 4</_name> + <_vendor>Novell</_vendor> + <family>netware</family> + <distro>netware</distro> + <version>4</version> + </os> +</libosinfo> diff --git a/data/oses/novell.com/netware-5.xml.in b/data/oses/novell.com/netware-5.xml.in new file mode 100644 index 0000000..d9631d1 --- /dev/null +++ b/data/oses/novell.com/netware-5.xml.in @@ -0,0 +1,10 @@ +<libosinfo version="0.0.1"> + <os id="http://novell.com/netware/5";> + <short-id>netware5</short-id> + <_name>Novell Netware 5</_name> + <_vendor>Novell</_vendor> + <family>netware</family> + <distro>netware</distro> + <version>5</version> + </os> +</libosinfo> diff --git a/data/oses/novell.com/netware-6.xml.in b/data/oses/novell.com/netware-6.xml.in new file mode 100644 index 0000000..96c2341 --- /dev/null +++ b/data/oses/novell.com/netware-6.xml.in @@ -0,0 +1,10 @@ +<libosinfo version="0.0.1"> + <os id="http://novell.com/netware/6";> + <short-id>netware6</short-id> + <_name>Novell Netware 6</_name> + <_vendor>Novell</_vendor> + <family>netware</family> + <distro>netware</distro> + <version>6</version> + </os> +</libosinfo> diff --git a/po/POTFILES.in b/po/POTFILES.in index 3ac3425..9fe7ea8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -160,7 +160,9 @@ data/oses/netbsd.org/netbsd-3.0.xml.in data/oses/netbsd.org/netbsd-4.0.xml.in data/oses/netbsd.org/netbsd-5.0.xml.in data/oses/netbsd.org/netbsd-5.1.xml.in -data/oses/netware.xml.in +data/oses/novell.com/netware-4.xml.in +data/oses/novell.com/netware-5.xml.in +data/oses/novell.com/netware-6.xml.in data/oses/solaris.xml.in data/oses/suse.xml.in data/oses/rhel.xml.in -- 2.4.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
