Hello community, here is the log from the commit of package libosinfo for openSUSE:Factory checked in at 2015-07-27 09:08:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosinfo (Old) and /work/SRC/openSUSE:Factory/.libosinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/libosinfo/libosinfo.changes 2015-06-01 09:31:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libosinfo.new/libosinfo.changes 2015-07-27 09:08:41.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Jul 20 16:25:14 MDT 2015 - carn...@suse.com + +- bsc#938843 - Libosinfo has no support for sles/sled 12 sp1 + add-sle12sp1-support.patch +- Add additional support and fixes + 6c3ddecb-add-rhel7.1-support.patch + 7b31e3ac-add-qemu-2.3-support.patch + a563ad22-fix-fedora-unknown-regexp.patch + +------------------------------------------------------------------- +Fri Jun 5 14:11:08 MDT 2015 - carn...@suse.com + +- Add support for openSUSE 13.2 + 1d08a23c-add-opensuse-13.2-support.patch + +------------------------------------------------------------------- New: ---- 1d08a23c-add-opensuse-13.2-support.patch 6c3ddecb-add-rhel7.1-support.patch 7b31e3ac-add-qemu-2.3-support.patch a563ad22-fix-fedora-unknown-regexp.patch add-sle12sp1-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosinfo.spec ++++++ --- /var/tmp/diff_new_pack.k3RjsA/_old 2015-07-27 09:08:42.000000000 +0200 +++ /var/tmp/diff_new_pack.k3RjsA/_new 2015-07-27 09:08:42.000000000 +0200 @@ -27,6 +27,11 @@ Group: System/Libraries Url: http://libosinfo.org/ Source: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz +Patch1: 1d08a23c-add-opensuse-13.2-support.patch +Patch2: 6c3ddecb-add-rhel7.1-support.patch +Patch3: 7b31e3ac-add-qemu-2.3-support.patch +Patch4: a563ad22-fix-fedora-unknown-regexp.patch +Patch5: add-sle12sp1-support.patch BuildRequires: intltool BuildRequires: libtool BuildRequires: vala @@ -91,6 +96,11 @@ %endif %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %configure \ ++++++ 1d08a23c-add-opensuse-13.2-support.patch ++++++ Subject: suse: Add opensuse 13.2 info From: Lin Ma l...@suse.com Wed Jun 3 09:54:38 2015 +0800 Date: Thu Jun 4 15:59:56 2015 +0100: Git: 1d08a23c320db2e207a810aaee0186d07f7b2535 Signed-off-by: Lin Ma <l...@suse.com> diff --git a/data/oses/opensuse.xml.in b/data/oses/opensuse.xml.in index 1c89d00..d922965 100644 --- a/data/oses/opensuse.xml.in +++ b/data/oses/opensuse.xml.in @@ -441,6 +441,40 @@ </resources> </os> + <os id="http://opensuse.org/opensuse/13.2";> + <short-id>opensuse13.2</short-id> + <_name>openSUSE 13.2</_name> + <version>13.2</version> + <_vendor>openSUSE</_vendor> + <family>linux</family> + <distro>opensuse</distro> + <upgrades id="http://opensuse.org/opensuse/13.1"; /> + <derives-from id="http://opensuse.org/opensuse/13.1"; /> + + <release-date>2014-11-04</release-date> + + <media arch="i686"> + <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-i586.iso</url> + <iso> + <volume-id>openSUSE-13.2-DVD</volume-id> + <system-id>LINUX</system-id> + <publisher-id>SUSE LINUX GmbH</publisher-id> + </iso> + <kernel>boot/i386/loader/linux</kernel> + <initrd>boot/i386/loader/initrd</initrd> + </media> + <media arch="x86_64"> + <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-x86_64.iso</url> + <iso> + <volume-id>openSUSE-13.2-DVD-x86_64</volume-id> + <system-id>LINUX</system-id> + <publisher-id>SUSE LINUX GmbH</publisher-id> + </iso> + <kernel>boot/x86_64/loader/linux</kernel> + <initrd>boot/x86_64/loader/initrd</initrd> + </media> + </os> + <!-- Generic entry for future openSUSE releases. Please update the 'upgrades', 'derives-from', 'volume-id' and 'resources' nodes accordingly each time you add a new (specific) entry for a new @@ -452,13 +486,13 @@ <_vendor>openSUSE</_vendor> <family>linux</family> <distro>opensuse</distro> - <upgrades id="http://opensuse.org/opensuse/13.1"; /> - <derives-from id="http://opensuse.org/opensuse/13.1"; /> + <upgrades id="http://opensuse.org/opensuse/13.2"; /> + <derives-from id="http://opensuse.org/opensuse/13.2"; /> <release-status>prerelease</release-status> <media arch="i686"> <iso> - <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[2-9])-DVD</volume-id> + <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD</volume-id> <system-id>LINUX</system-id> <publisher-id>SUSE LINUX GmbH</publisher-id> </iso> @@ -467,7 +501,7 @@ </media> <media arch="x86_64"> <iso> - <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[2-9])-DVD-x86_64</volume-id> + <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD-x86_64</volume-id> <system-id>LINUX</system-id> <publisher-id>SUSE LINUX GmbH</publisher-id> </iso> @@ -498,8 +532,8 @@ <_vendor>openSUSE</_vendor> <family>linux</family> <distro>opensuse</distro> - <upgrades id="http://opensuse.org/opensuse/13.1"; /> - <derives-from id="http://opensuse.org/opensuse/13.1"; /> + <upgrades id="http://opensuse.org/opensuse/13.2"; /> + <derives-from id="http://opensuse.org/opensuse/13.2"; /> <release-status>snapshot</release-status> <media arch="i686"> diff --git a/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt new file mode 100644 index 0000000..a2c3afd --- /dev/null +++ b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: openSUSE-13.2-DVD-i5860054 +Volume set id: +Publisher id: SUSE LINUX GmbH +Data preparer id: KIWI - http://opensuse.github.com/kiwi +Application id: openSUSE-13.2-DVD-i586-Build0054-Media +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 2257566 +El Torito VD version 1 found, boot catalog is in sector 20 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'SUSE LINUX GmbH' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 347 839 diff --git a/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt new file mode 100644 index 0000000..f78c781 --- /dev/null +++ b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: openSUSE-13.2-DVD-x86_640051 +Volume set id: +Publisher id: SUSE LINUX GmbH +Data preparer id: KIWI - http://opensuse.github.com/kiwi +Application id: openSUSE-13.2-DVD-x86_64-Build0051-Media +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 2284287 +El Torito VD version 1 found, boot catalog is in sector 20 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'SUSE LINUX GmbH' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 16C2 5826 ++++++ 6c3ddecb-add-rhel7.1-support.patch ++++++ Subject: rhel: Add data about RHEL 7.1 From: Zeeshan Ali (Khattak) zeesha...@gnome.org Tue Jul 7 21:05:32 2015 +0100 Date: Thu Jul 9 14:47:02 2015 +0100: Git: 6c3ddecb5e9167c6eff182ac62358c9e96c47d36 diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in index 23cc0f2..2f0d4e8 100644 --- a/data/oses/rhel.xml.in +++ b/data/oses/rhel.xml.in @@ -1221,4 +1221,115 @@ </recommended> </resources> </os> + + <os id="http://redhat.com/rhel/7.1";> + <short-id>rhel7.1</short-id> + <_name>Red Hat Enterprise Linux 7.1</_name> + <version>7.1</version> + <_vendor>Red Hat, Inc</_vendor> + <family>linux</family> + <distro>rhel</distro> + <upgrades id="http://redhat.com/rhel/7.0"/> + <derives-from id="http://redhat.com/rhel/7.0"/> + + <media arch="i686"> + <iso> + <system-id>LINUX</system-id> + <volume-id>.*RHEL-7.1.*i386.*</volume-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> + <volume-id>.*RHEL-7.1.*x86_64.*</volume-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + + <resources arch="ppc64"> + <minimum> + <n-cpus>1</n-cpus> + <cpu>1000000000</cpu> + <ram>2147483648</ram> + <storage>10737418240</storage> + </minimum> + + <recommended> + <cpu>400000000</cpu> + <ram>2147483648</ram> + <storage>21474836480</storage> + </recommended> + </resources> + + <resources arch="all"> + <minimum> + <n-cpus>1</n-cpus> + <cpu>1000000000</cpu> + <ram>1073741824</ram> + <storage>10737418240</storage> + </minimum> + + <recommended> + <cpu>400000000</cpu> + <ram>1073741824</ram> + <storage>9663676416</storage> + </recommended> + </resources> + + <installer> + <script id='http://redhat.com/scripts/rhel/jeos'/> + <script id='http://redhat.com/scripts/rhel/desktop'/> + </installer> + </os> + + <os id="http://redhat.com/rhel-atomic/7.1";> + <short-id>rhel-atomic-7.1</short-id> + <_name>Red Hat Enterprise Linux Atomic Host 7.1</_name> + <version>7.1</version> + <_vendor>Red Hat, Inc</_vendor> + <family>linux</family> + <distro>rhel</distro> + <upgrades id="http://redhat.com/rhel-atomic/7.0"/> + <derives-from id="http://redhat.com/rhel-atomic/7.0"/> + + <!-- 7.1-0 --> + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> + <volume-id>RHEL.*Atomic.*7 x86_64.*</volume-id> + <volume-size>652435456</volume-size> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + + <!-- 7.1-1 --> + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> + <volume-id>RHEL.*Atomic.*7 x86_64.*</volume-id> + <volume-size>654243840</volume-size> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + + <resources arch="all"> + <minimum> + <n-cpus>1</n-cpus> + <cpu>1000000000</cpu> + <ram>1073741824</ram> + <storage>10737418240</storage> + </minimum> + + <recommended> + <cpu>400000000</cpu> + <ram>1073741824</ram> + <storage>9663676416</storage> + </recommended> + </resources> + </os> </libosinfo> diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt new file mode 100644 index 0000000..10fb7ce --- /dev/null +++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: RHEL Atomic Host 7 x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 318572 +El Torito VD version 1 found, boot catalog is in sector 46 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 456D 17773 diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt new file mode 100644 index 0000000..f6569fa --- /dev/null +++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: RHEL Atomic Host 7 x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 319455 +El Torito VD version 1 found, boot catalog is in sector 46 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 458B 17803 diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt new file mode 100644 index 0000000..92b8597 --- /dev/null +++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: RHEL-7.1 Client.x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1870122 +El Torito VD version 1 found, boot catalog is in sector 986 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2AE29 175657 diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt new file mode 100644 index 0000000..8aba100 --- /dev/null +++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: RHEL-7.1 Server.x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1899146 +El Torito VD version 1 found, boot catalog is in sector 1102 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2AE9E 175774 diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt new file mode 100644 index 0000000..dea75a5 --- /dev/null +++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: RHEL-7.1 Workstation.x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 2152803 +El Torito VD version 1 found, boot catalog is in sector 1121 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2AEB0 175792 ++++++ 7b31e3ac-add-qemu-2.3-support.patch ++++++ Subject: Added support for qemu upto version 2.3.0 From: T A Mahadevan ta.mahade...@gmail.com Wed Jul 8 18:46:44 2015 +0530 Date: Thu Jul 16 17:36:59 2015 +0200: Git: 7b31e3ac4fdd58922035cd7b9d83e00aea6c5532 diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 03590a3..8fa2e0b 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -253,4 +253,111 @@ <upgrades id="http://qemu.org/1.6.1"/> </platform> + <platform id="http://qemu.org/1.7.1";> + <short-id>qemu-1.7.1</short-id> + <_name>QEMU 1.7.1</_name> + <_vendor>qemu.org</_vendor> + <version>1.7.1</version> + <release-date>2014-03-03</release-date> + <upgrades id="http://qemu.org/1.7.0"/> + </platform> + + <platform id="http://qemu.org/1.7.2";> + <short-id>qemu-1.7.2</short-id> + <_name>QEMU 1.7.2</_name> + <_vendor>qemu.org</_vendor> + <version>1.7.2</version> + <release-date>2014-07-21</release-date> + <upgrades id="http://qemu.org/1.7.1"/> + </platform> + + <platform id="http://qemu.org/2.0.0";> + <short-id>qemu-2.0.0</short-id> + <_name>QEMU 2.0.0</_name> + <_vendor>qemu.org</_vendor> + <version>2.0.0</version> + <release-date>2014-04-17</release-date> + <upgrades id="http://qemu.org/1.7.2"/> + </platform> + + <platform id="http://qemu.org/2.0.1";> + <short-id>qemu-2.0.1</short-id> + <_name>QEMU 2.0.1</_name> + <_vendor>qemu.org</_vendor> + <version>2.0.1</version> + <release-date>2014-08-15</release-date> + <upgrades id="http://qemu.org/2.0.0"/> + </platform> + + <platform id="http://qemu.org/2.0.2";> + <short-id>qemu-2.0.2</short-id> + <_name>QEMU 2.0.2</_name> + <_vendor>qemu.org</_vendor> + <version>2.0.2</version> + <release-date>2014-08-18</release-date> + <upgrades id="http://qemu.org/2.0.1"/> + </platform> + + <platform id="http://qemu.org/2.1.0";> + <short-id>qemu-2.1.0</short-id> + <_name>QEMU 2.1.0</_name> + <_vendor>qemu.org</_vendor> + <version>2.1.0</version> + <release-date>2014-08-01</release-date> + <upgrades id="http://qemu.org/2.0.2"/> + </platform> + + <platform id="http://qemu.org/2.1.1";> + <short-id>qemu-2.1.1</short-id> + <_name>QEMU 2.1.1</_name> + <_vendor>qemu.org</_vendor> + <version>2.1.1</version> + <release-date>2014-09-10</release-date> + <upgrades id="http://qemu.org/2.1.0"/> + </platform> + + <platform id="http://qemu.org/2.1.2";> + <short-id>qemu-2.1.2</short-id> + <_name>QEMU 2.1.2</_name> + <_vendor>qemu.org</_vendor> + <version>2.1.2</version> + <release-date>2014-09-25</release-date> + <upgrades id="http://qemu.org/2.1.1"/> + </platform> + + <platform id="http://qemu.org/2.1.3";> + <short-id>qemu-2.1.3</short-id> + <_name>QEMU 2.1.3</_name> + <_vendor>qemu.org</_vendor> + <version>2.1.3</version> + <release-date>2015-01-22</release-date> + <upgrades id="http://qemu.org/2.1.2"/> + </platform> + + <platform id="http://qemu.org/2.2.0";> + <short-id>qemu-2.2.0</short-id> + <_name>QEMU 2.2.0</_name> + <_vendor>qemu.org</_vendor> + <version>2.2.0</version> + <release-date>2014-12-09</release-date> + <upgrades id="http://qemu.org/2.1.3"/> + </platform> + + <platform id="http://qemu.org/2.2.1";> + <short-id>qemu-2.2.1</short-id> + <_name>QEMU 2.2.1</_name> + <_vendor>qemu.org</_vendor> + <version>2.2.1</version> + <release-date>2015-03-10</release-date> + <upgrades id="http://qemu.org/2.2.0"/> + </platform> + + <platform id="http://qemu.org/2.3.0";> + <short-id>qemu-2.3.0</short-id> + <_name>QEMU 2.3.0</_name> + <_vendor>qemu.org</_vendor> + <version>2.3.0</version> + <release-date>2015-04-24</release-date> + <upgrades id="http://qemu.org/2.2.1"/> + </platform> </libosinfo> ++++++ a563ad22-fix-fedora-unknown-regexp.patch ++++++ Subject: fedora: Fix fedora-unknown regexp From: Christophe Fergeau cferg...@redhat.com Thu Jul 16 17:55:01 2015 +0200 Date: Fri Jul 17 09:43:08 2015 +0200: Git: a563ad22b34963a1c0a5364efea9e17c62d16909 It's currently matching fedora 21 and fedora 22, causing make distcheck failures. diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index 0fc2cfe..b81f3c9 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -4263,13 +4263,13 @@ <media arch="i686"> <iso> - <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386</volume-id> + <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id> <system-id>LINUX</system-id> </iso> </media> <media arch="x86_64"> <iso> - <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64</volume-id> + <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>isolinux/vmlinuz</kernel> @@ -4278,13 +4278,13 @@ <media arch="i686" live="true"> <iso> - <volume-id>Fedora-Live-.*-i686-([2-9][1-9]|[0-9]{3,})</volume-id> + <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id> <system-id>LINUX</system-id> </iso> </media> <media arch="x86_64" live="true"> <iso> - <volume-id>Fedora-Live-.*-x86_64-([2-9][1-9]|[0-9]{3,})</volume-id> + <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id> <system-id>LINUX</system-id> </iso> </media> ++++++ add-sle12sp1-support.patch ++++++ Index: libosinfo-0.2.12/data/oses/suse.xml.in =================================================================== --- libosinfo-0.2.12.orig/data/oses/suse.xml.in +++ libosinfo-0.2.12/data/oses/suse.xml.in @@ -170,6 +170,26 @@ </media> </os> + <os id="http://suse.com/sles/12.1";> + <short-id>sles12</short-id> + <_name>SUSE Linux Enterprise Server 12 SP1</_name> + <version>12.1</version> + <_vendor>SUSE</_vendor> + <family>linux</family> + <distro>sles</distro> + <upgrades id="http://suse.com/sles/12"/> + <derives-from id="http://suse.com/sles/12"/> + + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> + <volume-id>SLE-12-SP1-Server-DVD-x86_64</volume-id> + </iso> + <kernel>boot/x86_64/loader/linux</kernel> + <initrd>boot/x86_64/loader/initrd</initrd> + </media> + </os> + <os id="http://suse.com/sled/9";> <short-id>sled9</short-id> <_name>SUSE Linux Enterprise Desktop 9</_name> @@ -360,4 +380,24 @@ </resources> </os> + <os id="http://suse.com/sled/12.1";> + <short-id>sled12sp1</short-id> + <_name>SUSE Linux Enterprise Desktop 12 SP1</_name> + <version>12.1</version> + <_vendor>SUSE</_vendor> + <family>linux</family> + <distro>sled</distro> + <upgrades id="http://suse.com/sled/12"/> + <derives-from id="http://suse.com/sled/12"/> + + <media arch="x86_64"> + <iso> + <system-id>LINUX</system-id> + <volume-id>SLE-12-SP1-Desktop-DVD-x86_64</volume-id> + </iso> + <kernel>boot/x86_64/loader/linux</kernel> + <initrd>boot/x86_64/loader/initrd</initrd> + </media> + </os> + </libosinfo>
