[Libosinfo] [PATCH v3 25/60] data: split mageia into one file per OS
Daniel P. Berrange
berrange at redhat.com
Mon Oct 12 17:10:46 UTC 2015
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
configure.ac | 1 +
data/oses/Makefile.am | 2 +-
data/oses/mageia.org/Makefile.am | 1 +
data/oses/mageia.org/mageia-1.xml.in | 58 +++++++++++++++
data/oses/mageia.org/mageia-2.xml.in | 32 +++++++++
data/oses/mageia.org/mageia-3.xml.in | 43 +++++++++++
data/oses/mageia.xml.in | 133 -----------------------------------
po/POTFILES.in | 4 +-
8 files changed, 139 insertions(+), 135 deletions(-)
create mode 100644 data/oses/mageia.org/Makefile.am
create mode 100644 data/oses/mageia.org/mageia-1.xml.in
create mode 100644 data/oses/mageia.org/mageia-2.xml.in
create mode 100644 data/oses/mageia.org/mageia-3.xml.in
delete mode 100644 data/oses/mageia.xml.in
diff --git a/configure.ac b/configure.ac
index 1cec28a..f5b75fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,7 @@ AC_CONFIG_FILES([
data/oses/fedoraproject.org/Makefile
data/oses/freebsd.org/Makefile
data/oses/gnome.org/Makefile
+ data/oses/mageia.org/Makefile
data/oses/microsoft.com/Makefile
data/schemas/Makefile
tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 02f482b..dbe75dd 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -7,12 +7,12 @@ SUBDIRS = \
fedoraproject.org \
freebsd.org \
gnome.org \
+ mageia.org \
microsoft.com \
$(NULL)
databasedir = $(pkgdatadir)/db/oses/
database_in_files = \
- mageia.xml.in \
mandriva.xml.in \
mandrake.xml.in \
netbsd.xml.in \
diff --git a/data/oses/mageia.org/Makefile.am b/data/oses/mageia.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/mageia.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/mageia.org/mageia-1.xml.in b/data/oses/mageia.org/mageia-1.xml.in
new file mode 100644
index 0000000..39e6e5b
--- /dev/null
+++ b/data/oses/mageia.org/mageia-1.xml.in
@@ -0,0 +1,58 @@
+<libosinfo version="0.0.1">
+ <os id="http://mageia.org/mageia/1">
+ <short-id>mageia1</short-id>
+ <_name>Mageia 1</_name>
+ <_vendor>Mageia</_vendor>
+ <family>linux</family>
+ <distro>mageia</distro>
+ <version>1</version>
+ <derives-from id="http://mandriva.com/mandriva/2010.1"/>
+ <release-date>2011-06-01</release-date>
+ <eol-date>2012-12-01</eol-date>
+
+ <media arch="i686">
+ <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-i586</url>
+ <iso>
+ <volume-id>1-i586</volume-id>
+ <publisher-id>Mageia.Org</publisher-id>
+ </iso>
+ </media>
+ <media arch="i686">
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
+ <iso>
+ <volume-id>mageia-dual-1</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
+ <iso>
+ <volume-id>mageia-dual-1</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-x86_64</url>
+ <iso>
+ <volume-id>1-x86_64</volume-id>
+ <publisher-id>Mageia.Org</publisher-id>
+ </iso>
+ </media>
+ <media live="true" arch="i686">
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe1-cd-i586</url>
+<!--
+ The Mageia project releases several live CD isos for different languages, but libosinfo
+ currently only supports one <url> node per <media> node
+
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe2-cd-i586</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-asia-cd-i586</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-africa-cd-i586</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe1-cd-i586</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe2-cd-i586</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-asia-cd-i586</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-africa-cd-i586</url>
+-->
+ <iso>
+ <volume-id>Livecd-1-(GNOME|KDE)</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/oses/mageia.org/mageia-2.xml.in b/data/oses/mageia.org/mageia-2.xml.in
new file mode 100644
index 0000000..58d80f8
--- /dev/null
+++ b/data/oses/mageia.org/mageia-2.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+ <os id="http://mageia.org/mageia/2">
+ <short-id>mageia2</short-id>
+ <_name>Mageia 2</_name>
+ <_vendor>Mageia</_vendor>
+ <family>linux</family>
+ <distro>mageia</distro>
+ <version>2</version>
+ <derives-from id="http://mageia.org/mageia/1"/>
+ <release-date>2012-05-22</release-date>
+ <eol-date>2013-11-22</eol-date>
+
+ <media arch="i686">
+ <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-i586-DVD.iso</url>
+<!--
+ <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
+-->
+ <iso>
+ <volume-id>Mageia-2(-i586)?</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-x86_64-DVD.iso</url>
+<!--
+ <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
+-->
+ <iso>
+ <volume-id>Mageia-2(-x86_64)?</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/oses/mageia.org/mageia-3.xml.in b/data/oses/mageia.org/mageia-3.xml.in
new file mode 100644
index 0000000..429d475
--- /dev/null
+++ b/data/oses/mageia.org/mageia-3.xml.in
@@ -0,0 +1,43 @@
+<libosinfo version="0.0.1">
+ <os id="http://mageia.org/mageia/3">
+ <short-id>mageia3</short-id>
+ <_name>Mageia 3</_name>
+ <_vendor>Mageia</_vendor>
+ <family>linux</family>
+ <distro>mageia</distro>
+ <version>3</version>
+ <derives-from id="http://mageia.org/mageia/2"/>
+ <release-date>2013-05-19</release-date>
+ <eol-date>2014-11-19</eol-date>
+
+ <media arch="i686">
+ <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-i586-DVD.iso</url>
+<!--
+ <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
+-->
+ <iso>
+ <volume-id>Mageia-3(-i586)?</volume-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+ <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-x86_64-DVD.iso</url>
+<!--
+ <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
+-->
+ <iso>
+ <volume-id>Mageia-3(-x86_64)?</volume-id>
+ </iso>
+ </media>
+ <media live="true" arch="i686">
+ <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso</url>
+<!--
+ <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso</url>
+ <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso</url>
+-->
+ <iso>
+ <volume-id>Mageia-3-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
+ </iso>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/oses/mageia.xml.in b/data/oses/mageia.xml.in
deleted file mode 100644
index 4e994d8..0000000
--- a/data/oses/mageia.xml.in
+++ /dev/null
@@ -1,133 +0,0 @@
-<libosinfo version="0.0.1">
-
- <os id="http://mageia.org/mageia/1">
- <short-id>mageia1</short-id>
- <_name>Mageia 1</_name>
- <_vendor>Mageia</_vendor>
- <family>linux</family>
- <distro>mageia</distro>
- <version>1</version>
- <derives-from id="http://mandriva.com/mandriva/2010.1"/>
- <release-date>2011-06-01</release-date>
- <eol-date>2012-12-01</eol-date>
-
- <media arch="i686">
- <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-i586</url>
- <iso>
- <volume-id>1-i586</volume-id>
- <publisher-id>Mageia.Org</publisher-id>
- </iso>
- </media>
- <media arch="i686">
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
- <iso>
- <volume-id>mageia-dual-1</volume-id>
- </iso>
- </media>
- <media arch="x86_64">
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
- <iso>
- <volume-id>mageia-dual-1</volume-id>
- </iso>
- </media>
- <media arch="x86_64">
- <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-x86_64</url>
- <iso>
- <volume-id>1-x86_64</volume-id>
- <publisher-id>Mageia.Org</publisher-id>
- </iso>
- </media>
- <media live="true" arch="i686">
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe1-cd-i586</url>
-<!--
- The Mageia project releases several live CD isos for different languages, but libosinfo
- currently only supports one <url> node per <media> node
-
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe2-cd-i586</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-asia-cd-i586</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-africa-cd-i586</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe1-cd-i586</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe2-cd-i586</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-asia-cd-i586</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-africa-cd-i586</url>
--->
- <iso>
- <volume-id>Livecd-1-(GNOME|KDE)</volume-id>
- </iso>
- </media>
- </os>
-
- <os id="http://mageia.org/mageia/2">
- <short-id>mageia2</short-id>
- <_name>Mageia 2</_name>
- <_vendor>Mageia</_vendor>
- <family>linux</family>
- <distro>mageia</distro>
- <version>2</version>
- <derives-from id="http://mageia.org/mageia/1"/>
- <release-date>2012-05-22</release-date>
- <eol-date>2013-11-22</eol-date>
-
- <media arch="i686">
- <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-i586-DVD.iso</url>
-<!--
- <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
--->
- <iso>
- <volume-id>Mageia-2(-i586)?</volume-id>
- </iso>
- </media>
- <media arch="x86_64">
- <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-x86_64-DVD.iso</url>
-<!--
- <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
--->
- <iso>
- <volume-id>Mageia-2(-x86_64)?</volume-id>
- </iso>
- </media>
- </os>
-
- <os id="http://mageia.org/mageia/3">
- <short-id>mageia3</short-id>
- <_name>Mageia 3</_name>
- <_vendor>Mageia</_vendor>
- <family>linux</family>
- <distro>mageia</distro>
- <version>3</version>
- <derives-from id="http://mageia.org/mageia/2"/>
- <release-date>2013-05-19</release-date>
- <eol-date>2014-11-19</eol-date>
-
- <media arch="i686">
- <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-i586-DVD.iso</url>
-<!--
- <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
--->
- <iso>
- <volume-id>Mageia-3(-i586)?</volume-id>
- </iso>
- </media>
- <media arch="x86_64">
- <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-x86_64-DVD.iso</url>
-<!--
- <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
--->
- <iso>
- <volume-id>Mageia-3(-x86_64)?</volume-id>
- </iso>
- </media>
- <media live="true" arch="i686">
- <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso</url>
-<!--
- <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso</url>
- <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso</url>
--->
- <iso>
- <volume-id>Mageia-3-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
- </iso>
- </media>
- </os>
-
-</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2139249..268e8d0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -111,10 +111,12 @@ data/oses/gnome.org/gnome-3.8.xml.in
data/oses/gnome.org/gnome-continuous-3.10.xml.in
data/oses/gnome.org/gnome-continuous-3.12.xml.in
data/oses/gnome.org/gnome-continuous-3.14.xml.in
+data/oses/mageia.org/mageia-1.xml.in
+data/oses/mageia.org/mageia-2.xml.in
+data/oses/mageia.org/mageia-3.xml.in
data/oses/microsoft.com/msdos-6.22.xml.in
data/oses/netware.xml.in
data/oses/solaris.xml.in
-data/oses/mageia.xml.in
data/oses/mandrake.xml.in
data/oses/mandriva.xml.in
data/oses/suse.xml.in
--
2.4.3
More information about the Libosinfo
mailing list