From 3dfa8cec31af6b6affcea4d2b3fe30b41b7e64e9f5e91f9280b9df12a908e397 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 2 Feb 2016 16:04:51 +0000 Subject: [PATCH 1/2] Accepting request 357375 from Virtualization Update to version 0.3.0 OBS-URL: https://build.opensuse.org/request/show/357375 OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=41 --- 1d08a23c-add-opensuse-13.2-support.patch | 159 ----------- 6c3ddecb-add-rhel7.1-support.patch | 301 --------------------- 7b31e3ac-add-qemu-2.3-support.patch | 122 --------- Fix_derives-from_and_add_tablet_item.patch | 137 ++++++++++ a563ad22-fix-fedora-unknown-regexp.patch | 44 --- add-opensuse-leap-42.1-support.patch | 57 +--- add-sle12sp1-support.patch | 40 +-- add-sle12sp2-support.patch | 56 ++++ ids.tar.bz2 | 3 + libosinfo-0.2.12.tar.gz | 3 - libosinfo-0.3.0.tar.bz2 | 3 + libosinfo.changes | 67 +++++ libosinfo.spec | 29 +- 13 files changed, 311 insertions(+), 710 deletions(-) delete mode 100644 1d08a23c-add-opensuse-13.2-support.patch delete mode 100644 6c3ddecb-add-rhel7.1-support.patch delete mode 100644 7b31e3ac-add-qemu-2.3-support.patch create mode 100644 Fix_derives-from_and_add_tablet_item.patch delete mode 100644 a563ad22-fix-fedora-unknown-regexp.patch create mode 100644 add-sle12sp2-support.patch create mode 100644 ids.tar.bz2 delete mode 100644 libosinfo-0.2.12.tar.gz create mode 100644 libosinfo-0.3.0.tar.bz2 diff --git a/1d08a23c-add-opensuse-13.2-support.patch b/1d08a23c-add-opensuse-13.2-support.patch deleted file mode 100644 index 038f26d..0000000 --- a/1d08a23c-add-opensuse-13.2-support.patch +++ /dev/null @@ -1,159 +0,0 @@ -Subject: suse: Add opensuse 13.2 info -From: Lin Ma lma@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 - -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 @@ - - - -+ -+ opensuse13.2 -+ <_name>openSUSE 13.2 -+ 13.2 -+ <_vendor>openSUSE -+ linux -+ opensuse -+ -+ -+ -+ 2014-11-04 -+ -+ -+ http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-i586.iso -+ -+ openSUSE-13.2-DVD -+ LINUX -+ SUSE LINUX GmbH -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-x86_64.iso -+ -+ openSUSE-13.2-DVD-x86_64 -+ LINUX -+ SUSE LINUX GmbH -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ - -+ -+ -+ LINUX -+ RHEL.*Atomic.*7 x86_64.* -+ 652435456 -+ -+ isolinux/vmlinuz -+ isolinux/initrd.img -+ -+ -+ -+ -+ -+ LINUX -+ RHEL.*Atomic.*7 x86_64.* -+ 654243840 -+ -+ isolinux/vmlinuz -+ isolinux/initrd.img -+ -+ -+ -+ -+ 1 -+ 1000000000 -+ 1073741824 -+ 10737418240 -+ -+ -+ -+ 400000000 -+ 1073741824 -+ 9663676416 -+ -+ -+ - -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 diff --git a/7b31e3ac-add-qemu-2.3-support.patch b/7b31e3ac-add-qemu-2.3-support.patch deleted file mode 100644 index a71783b..0000000 --- a/7b31e3ac-add-qemu-2.3-support.patch +++ /dev/null @@ -1,122 +0,0 @@ -Subject: Added support for qemu upto version 2.3.0 -From: T A Mahadevan ta.mahadevan@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 @@ - - - -+ -+ qemu-1.7.1 -+ <_name>QEMU 1.7.1 -+ <_vendor>qemu.org -+ 1.7.1 -+ 2014-03-03 -+ -+ -+ -+ -+ qemu-1.7.2 -+ <_name>QEMU 1.7.2 -+ <_vendor>qemu.org -+ 1.7.2 -+ 2014-07-21 -+ -+ -+ -+ -+ qemu-2.0.0 -+ <_name>QEMU 2.0.0 -+ <_vendor>qemu.org -+ 2.0.0 -+ 2014-04-17 -+ -+ -+ -+ -+ qemu-2.0.1 -+ <_name>QEMU 2.0.1 -+ <_vendor>qemu.org -+ 2.0.1 -+ 2014-08-15 -+ -+ -+ -+ -+ qemu-2.0.2 -+ <_name>QEMU 2.0.2 -+ <_vendor>qemu.org -+ 2.0.2 -+ 2014-08-18 -+ -+ -+ -+ -+ qemu-2.1.0 -+ <_name>QEMU 2.1.0 -+ <_vendor>qemu.org -+ 2.1.0 -+ 2014-08-01 -+ -+ -+ -+ -+ qemu-2.1.1 -+ <_name>QEMU 2.1.1 -+ <_vendor>qemu.org -+ 2.1.1 -+ 2014-09-10 -+ -+ -+ -+ -+ qemu-2.1.2 -+ <_name>QEMU 2.1.2 -+ <_vendor>qemu.org -+ 2.1.2 -+ 2014-09-25 -+ -+ -+ -+ -+ qemu-2.1.3 -+ <_name>QEMU 2.1.3 -+ <_vendor>qemu.org -+ 2.1.3 -+ 2015-01-22 -+ -+ -+ -+ -+ qemu-2.2.0 -+ <_name>QEMU 2.2.0 -+ <_vendor>qemu.org -+ 2.2.0 -+ 2014-12-09 -+ -+ -+ -+ -+ qemu-2.2.1 -+ <_name>QEMU 2.2.1 -+ <_vendor>qemu.org -+ 2.2.1 -+ 2015-03-10 -+ -+ -+ -+ -+ qemu-2.3.0 -+ <_name>QEMU 2.3.0 -+ <_vendor>qemu.org -+ 2.3.0 -+ 2015-04-24 -+ -+ - diff --git a/Fix_derives-from_and_add_tablet_item.patch b/Fix_derives-from_and_add_tablet_item.patch new file mode 100644 index 0000000..4f75b58 --- /dev/null +++ b/Fix_derives-from_and_add_tablet_item.patch @@ -0,0 +1,137 @@ +Index: libosinfo-0.3.0/data/os/opensuse.org/opensuse-12.1.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/opensuse.org/opensuse-12.1.xml.in ++++ libosinfo-0.3.0/data/os/opensuse.org/opensuse-12.1.xml.in +@@ -9,6 +9,10 @@ + + + ++ ++ ++ ++ + + http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-i586.iso + +Index: libosinfo-0.3.0/data/os/suse.com/sles-11.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sles-11.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sles-11.xml.in +@@ -9,6 +9,7 @@ + + + ++ + + + +Index: libosinfo-0.3.0/data/os/suse.com/sles-11.1.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sles-11.1.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sles-11.1.xml.in +@@ -7,6 +7,7 @@ + linux + sles + ++ + + 2010-06-02 + +Index: libosinfo-0.3.0/data/os/suse.com/sles-11.2.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sles-11.2.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sles-11.2.xml.in +@@ -7,6 +7,7 @@ + linux + sles + ++ + + 2012-02-15 + +Index: libosinfo-0.3.0/data/os/suse.com/sles-11.3.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sles-11.3.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sles-11.3.xml.in +@@ -7,6 +7,7 @@ + linux + sles + ++ + + 2013-07-01 + +Index: libosinfo-0.3.0/data/os/suse.com/sles-11.4.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sles-11.4.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sles-11.4.xml.in +@@ -7,6 +7,7 @@ + linux + sles + ++ + + + +Index: libosinfo-0.3.0/data/os/suse.com/sled-11.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sled-11.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sled-11.xml.in +@@ -8,6 +8,9 @@ + sled + + ++ ++ ++ + + + 500000000 +Index: libosinfo-0.3.0/data/os/suse.com/sled-11.1.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sled-11.1.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sled-11.1.xml.in +@@ -7,6 +7,7 @@ + linux + sled + ++ + + + +Index: libosinfo-0.3.0/data/os/suse.com/sled-11.2.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sled-11.2.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sled-11.2.xml.in +@@ -7,6 +7,7 @@ + linux + sled + ++ + + + +Index: libosinfo-0.3.0/data/os/suse.com/sled-11.3.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sled-11.3.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sled-11.3.xml.in +@@ -7,6 +7,7 @@ + linux + sled + ++ + + + +Index: libosinfo-0.3.0/data/os/suse.com/sled-11.4.xml.in +=================================================================== +--- libosinfo-0.3.0.orig/data/os/suse.com/sled-11.4.xml.in ++++ libosinfo-0.3.0/data/os/suse.com/sled-11.4.xml.in +@@ -7,6 +7,7 @@ + linux + sled + ++ + + + diff --git a/a563ad22-fix-fedora-unknown-regexp.patch b/a563ad22-fix-fedora-unknown-regexp.patch deleted file mode 100644 index 428ee80..0000000 --- a/a563ad22-fix-fedora-unknown-regexp.patch +++ /dev/null @@ -1,44 +0,0 @@ -Subject: fedora: Fix fedora-unknown regexp -From: Christophe Fergeau cfergeau@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 @@ - - - -- Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386 -+ Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386 - LINUX - - - - -- Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64 -+ Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64 - LINUX - - isolinux/vmlinuz -@@ -4278,13 +4278,13 @@ - - - -- Fedora-Live-.*-i686-([2-9][1-9]|[0-9]{3,}) -+ Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,}) - LINUX - - - - -- Fedora-Live-.*-x86_64-([2-9][1-9]|[0-9]{3,}) -+ Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,}) - LINUX - - diff --git a/add-opensuse-leap-42.1-support.patch b/add-opensuse-leap-42.1-support.patch index 984e1aa..f8f0e60 100644 --- a/add-opensuse-leap-42.1-support.patch +++ b/add-opensuse-leap-42.1-support.patch @@ -1,33 +1,25 @@ -Index: libosinfo-0.2.12/data/oses/opensuse.xml.in +Index: libosinfo-0.3.0/data/os/opensuse.org/opensuse-42.1.xml.in =================================================================== ---- libosinfo-0.2.12.orig/data/oses/opensuse.xml.in -+++ libosinfo-0.2.12/data/oses/opensuse.xml.in -@@ -475,6 +475,36 @@ - - - +--- /dev/null ++++ libosinfo-0.3.0/data/os/opensuse.org/opensuse-42.1.xml.in +@@ -0,0 +1,25 @@ ++ + + opensuse42.1 -+ openSUSE 42.1 ++ <_name>openSUSE Leap 42.1 + 42.1 -+ openSUSE -+ openSUSE -+ openSUSE -+ openSUSE -+ openSUSE -+ openSUSE -+ openSUSE ++ <_vendor>openSUSE + linux + opensuse -+ -+ ++ ++ + + 2015-11-04 + + -+ http://download.opensuse.org/distribution/leap/42.1/iso/openSUSE-42.1-DVD-x86_64.iso ++ http://download.opensuse.org/distribution/leap/42.1/iso/openSUSE-Leap-42.1-DVD-x86_64.iso + -+ openSUSE-42.1-DVD-x86_64 ++ openSUSE-Leap-42.1-DVD-x86_64026 + LINUX + SUSE LINUX GmbH + @@ -35,29 +27,4 @@ Index: libosinfo-0.2.12/data/oses/opensuse.xml.in + boot/x86_64/loader/initrd + + -+ -