From 0df2d8c5bae211dd39dc3cdf2ce08fe1f26d17f4847eed6b2c573c6de92f9b01 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 23 Jan 2017 21:15:00 +0000 Subject: [PATCH 1/7] - bsc#1010060 - virt-install won't start CASP installation add-casp-support.patch - bsc#1013983 - incomplete capabilities list of SLE and openSUSE distributions in libosinfo 99f7e666-fix-opensuse-derives-from-information.patch 470b7652-add-opensuse-device-information.patch 3c621fd8-add-opensuse-date-information.patch e77abec7-add-opensuse-resource-information.patch 67c74e5f-add-opensuse-leap-42.2-support.patch f0d44d88-add-missing-sle10-distros.patch 9a35cea7-fix-sle-derives-from-information.patch 50091807-add-sle-device-information.patch 9dec2be8-add-sle-date-information.patch 1a7ce161-add-sle-resource-information.patch 99ae3d72-add-sle12sp2-support.patch - Dropped or renamed Fix_derives-from_and_add_tablet_item.patch add-opensuse-leap-42.2-support.patch add-sle12sp2-support.patch add-sle12sp2-support-for-arch.patch add-missing-sle10-distros.patch - Update to database version 20161026 osinfo-db-20161026.tar.xz - bsc#1012005 - [openqa virtualization] using the wrong bootloader tool to boot the sles-12-sp3 pv kernel on xen platform add-sle12sp3-support.patch add-opensuse-leap-42.3-support.patch OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=51 --- Fix_derives-from_and_add_tablet_item.patch | 137 --------- add-missing-sle10-distros.patch | 314 --------------------- add-opensuse-leap-42.2-support.patch | 28 -- add-sle12sp2-support.patch | 56 ---- ids.tar.bz2 | 4 +- libosinfo-0.3.1.tar.gz | 3 - libosinfo-1.0.0.tar.gz | 3 + libosinfo.changes | 28 ++ libosinfo.spec | 69 +++-- 9 files changed, 67 insertions(+), 575 deletions(-) delete mode 100644 Fix_derives-from_and_add_tablet_item.patch delete mode 100644 add-missing-sle10-distros.patch delete mode 100644 add-opensuse-leap-42.2-support.patch delete mode 100644 add-sle12sp2-support.patch delete mode 100644 libosinfo-0.3.1.tar.gz create mode 100644 libosinfo-1.0.0.tar.gz diff --git a/Fix_derives-from_and_add_tablet_item.patch b/Fix_derives-from_and_add_tablet_item.patch deleted file mode 100644 index 4f75b58..0000000 --- a/Fix_derives-from_and_add_tablet_item.patch +++ /dev/null @@ -1,137 +0,0 @@ -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/add-missing-sle10-distros.patch b/add-missing-sle10-distros.patch deleted file mode 100644 index b3005fc..0000000 --- a/add-missing-sle10-distros.patch +++ /dev/null @@ -1,314 +0,0 @@ -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 -@@ -6,7 +6,7 @@ - <_vendor>SUSE - 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 -@@ -6,7 +6,7 @@ - <_vendor>SUSE - linux - sled -- -+ - - - -Index: libosinfo-0.3.0/data/os/suse.com/sles-10.1.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sles-10.1.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sles10sp1 -+ <_name>SUSE Linux Enterprise Server 10 SP1 -+ 10.1 -+ <_vendor>SUSE -+ linux -+ sles -+ -+ -+ -+ 2007-06-18 -+ -+ -+ -+ LINUX -+ SLES-10-SP1-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLES-10-SP1-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sles-10.2.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sles-10.2.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sles10sp2 -+ <_name>SUSE Linux Enterprise Server 10 SP2 -+ 10.2 -+ <_vendor>SUSE -+ linux -+ sles -+ -+ -+ -+ 2008-05-19 -+ -+ -+ -+ LINUX -+ SLES-10-SP2-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLES-10-SP2-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sles-10.3.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sles-10.3.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sles10sp3 -+ <_name>SUSE Linux Enterprise Server 10 SP3 -+ 10.3 -+ <_vendor>SUSE -+ linux -+ sles -+ -+ -+ -+ 2009-10-12 -+ -+ -+ -+ LINUX -+ SLES-10-SP3-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLES-10-SP3-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sles-10.4.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sles-10.4.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sles10sp4 -+ <_name>SUSE Linux Enterprise Server 10 SP4 -+ 10.4 -+ <_vendor>SUSE -+ linux -+ sles -+ -+ -+ -+ 2008-05-19 -+ -+ -+ -+ LINUX -+ SLES-10-SP4-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLES-10-SP4-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sled-10.1.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sled-10.1.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sled10sp1 -+ <_name>SUSE Linux Enterprise Desktop 10 SP1 -+ 10.1 -+ <_vendor>SUSE -+ linux -+ sled -+ -+ -+ -+ 2007-06-18 -+ -+ -+ -+ LINUX -+ SLED-10-SP1-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLED-10-SP1-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sled-10.2.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sled-10.2.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sled10sp2 -+ <_name>SUSE Linux Enterprise Desktop 10 SP2 -+ 10.2 -+ <_vendor>SUSE -+ linux -+ sled -+ -+ -+ -+ 2008-05-19 -+ -+ -+ -+ LINUX -+ SLED-10-SP2-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLED-10-SP2-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sled-10.3.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sled-10.3.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sled10sp3 -+ <_name>SUSE Linux Enterprise Desktop 10 SP3 -+ 10.3 -+ <_vendor>SUSE -+ linux -+ sled -+ -+ -+ -+ 2009-10-12 -+ -+ -+ -+ LINUX -+ SLED-10-SP3-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLED-10-SP3-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sled-10.4.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sled-10.4.xml.in -@@ -0,0 +1,31 @@ -+ -+ -+ sled10sp4 -+ <_name>SUSE Linux Enterprise Desktop 10 SP4 -+ 10.4 -+ <_vendor>SUSE -+ linux -+ sled -+ -+ -+ -+ 2008-05-19 -+ -+ -+ -+ LINUX -+ SLED-10-SP4-DVD-i586 -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ -+ LINUX -+ SLED-10-SP4-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ diff --git a/add-opensuse-leap-42.2-support.patch b/add-opensuse-leap-42.2-support.patch deleted file mode 100644 index ade0ff5..0000000 --- a/add-opensuse-leap-42.2-support.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /dev/null 2016-06-27 08:08:16.091403020 -0600 -+++ libosinfo-0.3.0/data/os/opensuse.org/opensuse-42.2.xml.in 2016-06-27 15:43:31.520053909 -0600 -@@ -0,0 +1,25 @@ -+ -+ -+ opensuse42.2 -+ <_name>openSUSE Leap 42.2 -+ 42.2 -+ <_vendor>openSUSE -+ linux -+ opensuse -+ -+ -+ -+ 2016-11-04 -+ -+ -+ http://download.opensuse.org/distribution/leap/42.2/iso/openSUSE-Leap-42.2-DVD-x86_64.iso -+ -+ openSUSE-Leap-42.2-DVD-x86_64026 -+ LINUX -+ SUSE LINUX GmbH -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ diff --git a/add-sle12sp2-support.patch b/add-sle12sp2-support.patch deleted file mode 100644 index ecd6c5e..0000000 --- a/add-sle12sp2-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: libosinfo-0.3.0/data/os/suse.com/sles-12.2.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sles-12.2.xml.in -@@ -0,0 +1,23 @@ -+ -+ -+ sles12sp2 -+ <_name>SUSE Linux Enterprise Server 12 SP2 -+ 12.2 -+ <_vendor>SUSE -+ linux -+ sles -+ -+ -+ -+ 2016-00-00 -+ -+ -+ -+ LINUX -+ SLE-12-SP2-Server-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -Index: libosinfo-0.3.0/data/os/suse.com/sled-12.2.xml.in -=================================================================== ---- /dev/null -+++ libosinfo-0.3.0/data/os/suse.com/sled-12.2.xml.in -@@ -0,0 +1,23 @@ -+ -+ -+ sled12sp2 -+ <_name>SUSE Linux Enterprise Desktop 12 SP2 -+ 12.2 -+ <_vendor>SUSE -+ linux -+ sled -+ -+ -+ -+ 2016-00-00 -+ -+ -+ -+ LINUX -+ SLE-12-SP2-Desktop-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ diff --git a/ids.tar.bz2 b/ids.tar.bz2 index 2a5cb60..7d4490e 100644 --- a/ids.tar.bz2 +++ b/ids.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63e6b6a300f7e11fd093b2741ab87e8461c00a42f243677b9db09899f49a360f -size 394276 +oid sha256:8a05fc85d94423f260ab2c65e507546a64ee1bbfdfb75d6440d523fd064aa467 +size 406451 diff --git a/libosinfo-0.3.1.tar.gz b/libosinfo-0.3.1.tar.gz deleted file mode 100644 index 0c69fc9..0000000 --- a/libosinfo-0.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50b272943d68b77d5259f72be860acfd048126bc27e7aa9c2f9c77a7eacf3894 -size 1839185 diff --git a/libosinfo-1.0.0.tar.gz b/libosinfo-1.0.0.tar.gz new file mode 100644 index 0000000..036e4b7 --- /dev/null +++ b/libosinfo-1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7b425ecde5197d200820eb44401c5033771a5d114bd6390230de768aad0396b +size 896212 diff --git a/libosinfo.changes b/libosinfo.changes index 5089ff9..1c00db1 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Oct 11 15:56:28 MDT 2016 - carnold@suse.com + +- Update to version 1.0.0 + Changes in this release include: + - Update loader to follow new layout for external database + - Move all database files into separate osinfo-db package + - Move osinfo-db-validate into osinfo-db-tools package +- Patches moved to osinfo-db package (dropped) + add-missing-sle10-distros.patch + add-opensuse-leap-42.2-support.patch + add-sle12sp2-support-for-arch.patch + add-sle12sp2-support.patch + Fix_derives-from_and_add_tablet_item.patch + +------------------------------------------------------------------- +Thu Oct 6 14:28:03 MDT 2016 - carnold@suse.com + +- bsc#1003456 - virt-install fails to detect openSUSE Leap 42.2 ISO + add-opensuse-leap-42.2-support.patch + +------------------------------------------------------------------- +Tue Sep 27 15:38:04 MDT 2016 - carnold@suse.com + +- bsc#1000188 - virt-install on aarch64 does not detect + installation iso + add-sle12sp2-support-for-arch.patch + ------------------------------------------------------------------- Sat Jul 2 11:56:46 UTC 2016 - zaitor@opensuse.org diff --git a/libosinfo.spec b/libosinfo.spec index 8bad33a..8bbea96 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -1,7 +1,7 @@ # # spec file for package libosinfo # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %define with_lang 1 Name: libosinfo -Version: 0.3.1 +Version: 1.0.0 Release: 0 Summary: Manage information about operating systems and hypervisors License: LGPL-2.1+ and GPL-2.0+ @@ -28,32 +28,26 @@ Group: System/Libraries Url: http://libosinfo.org/ Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz Source1: ids.tar.bz2 -Patch0: Fix_derives-from_and_add_tablet_item.patch -Patch1: add-sle12sp2-support.patch -Patch2: add-missing-sle10-distros.patch -Patch3: add-opensuse-leap-42.2-support.patch BuildRequires: intltool -BuildRequires: libtool BuildRequires: vala BuildRequires: pkgconfig(check) -BuildRequires: pkgconfig(gio-2.0) >= 2.36 +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsoup-gnome-2.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) >= 1.0.0 +Requires: osinfo-db %if %{with_lang} Recommends: %{name}-lang %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -libosinfo is a GObject based library API for managing information about operating systems, -hypervisors and the (virtual) hardware devices they can support. It includes a database -containing device metadata and provides APIs to match/identify optimal devices for -deploying an operating system on a hypervisor. Via the magic of GObject Introspection, -the API is available in all common programming languages. +libosinfo is a library that allows virtualization provisioning tools to +determine the optimal device settings for a hypervisor/operating system +combination. %package -n libosinfo-1_0-0 Summary: Manage information about operating systems and hypervisors @@ -61,22 +55,18 @@ Group: System/Libraries Requires: %{name} >= %{version} %description -n libosinfo-1_0-0 -libosinfo is a GObject based library API for managing information about operating systems, -hypervisors and the (virtual) hardware devices they can support. It includes a database -containing device metadata and provides APIs to match/identify optimal devices for -deploying an operating system on a hypervisor. Via the magic of GObject Introspection, -the API is available in all common programming languages. +libosinfo is a library that allows virtualization provisioning tools to +determine the optimal device settings for a hypervisor/operating system +combination. %package -n typelib-1_0-Libosinfo-1_0 Summary: Manage information about operating systems and hypervisors Group: System/Libraries %description -n typelib-1_0-Libosinfo-1_0 -libosinfo is a GObject based library API for managing information about operating systems, -hypervisors and the (virtual) hardware devices they can support. It includes a database -containing device metadata and provides APIs to match/identify optimal devices for -deploying an operating system on a hypervisor. Via the magic of GObject Introspection, -the API is available in all common programming languages. +libosinfo is a library that allows virtualization provisioning tools to +determine the optimal device settings for a hypervisor/operating system +combination. %package devel Summary: Manage information about operating systems and hypervisors - Development Files @@ -85,25 +75,33 @@ Requires: libosinfo-1_0-0 = %{version} Requires: typelib-1_0-Libosinfo-1_0 = %{version} %description devel -libosinfo is a GObject based library API for managing information about operating systems, -hypervisors and the (virtual) hardware devices they can support. It includes a database -containing device metadata and provides APIs to match/identify optimal devices for -deploying an operating system on a hypervisor. Via the magic of GObject Introspection, -the API is available in all common programming languages. +libosinfo is a library that allows virtualization provisioning tools to +determine the optimal device settings for a hypervisor/operating system +combination. + +Libraries, includes, etc. to compile with the libosinfo library + +%package vala +Summary: Vala bindings +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description vala +libosinfo is a library that allows virtualization provisioning tools to +determine the optimal device settings for a hypervisor/operating system +combination. + +This package provides the Vala bindings for libosinfo library. %if %{with_lang} %lang_package %endif %prep %setup -q -a 1 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %configure \ - --disable-static + --disable-static --enable-vala=yes make %{?_smp_mflags} %install @@ -121,11 +119,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %defattr(-,root,root) %doc ChangeLog README COPYING %{_bindir}/osinfo-detect -%{_bindir}/osinfo-db-validate %{_bindir}/osinfo-install-script %{_bindir}/osinfo-query %{_datadir}/%{name}/ -%{_mandir}/man1/osinfo-db-validate.1%{?ext_man} %{_mandir}/man1/osinfo-detect.1%{?ext_man} %{_mandir}/man1/osinfo-install-script.1%{?ext_man} %{_mandir}/man1/osinfo-query.1%{?ext_man} @@ -145,6 +141,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/pkgconfig/%{name}-1.0.pc %{_libdir}/libosinfo-1.0.so %{_datadir}/gir-1.0/Libosinfo-1.0.gir + +%files vala +%defattr(-, root, root) %dir %{_datadir}/vala/ %dir %{_datadir}/vala/vapi/ %{_datadir}/vala/vapi/libosinfo-1.0.vapi From 9c8e96d9264439ae73b6f58886e22128b7dd9017a0a6ded79e8cc1034df2540a Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 24 Jan 2017 22:21:27 +0000 Subject: [PATCH 2/7] The goal with all these change log changes is to sync comments in Tumbleweed with what what is in SLE. Going forward we won't have diverging changelog and spec files. - bsc#1013983 - incomplete capabilities list of SLE and openSUSE distributions in libosinfo See osinfo-db package - bsc#1012005 - [openqa virtualization] using the wrong bootloader tool to boot the sles-12-sp3 pv kernel on xen platform See osinfo-db package OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=52 --- libosinfo.changes | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libosinfo.changes b/libosinfo.changes index 1c00db1..8ae6ba0 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Dec 6 16:32:18 MST 2016 - carnold@suse.com + +- bsc#1013983 - incomplete capabilities list of SLE and openSUSE + distributions in libosinfo + See osinfo-db package + +------------------------------------------------------------------- +Thu Dec 1 14:08:17 MST 2016 - carnold@suse.com + +- bsc#1012005 - [openqa virtualization] using the wrong bootloader + tool to boot the sles-12-sp3 pv kernel on xen platform + See osinfo-db package + ------------------------------------------------------------------- Tue Oct 11 15:56:28 MDT 2016 - carnold@suse.com From d38434f7d202088c260f76e67827b0b962f483f593d0d5665d7ea073cb253807 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 24 Jan 2017 22:22:34 +0000 Subject: [PATCH 3/7] More changelog fixes so that SLE and openSUSE can share sources - bsc#1013983 - incomplete capabilities list of SLE and openSUSE distributions in libosinfo 0ae4f0db-add-missing-sle12-distros.patch 1a7ce161-add-sle-resource-information.patch 3c621fd8-add-opensuse-date-information.patch 470b7652-add-opensuse-device-information.patch 50091807-add-sle-device-information.patch 67c74e5f-add-opensuse-leap-42.2-support.patch 99ae3d72-add-sle12sp2-support.patch 99f7e666-fix-opensuse-derives-from-information.patch 9a35cea7-fix-sle-derives-from-information.patch 9dec2be8-add-sle-date-information.patch e77abec7-add-opensuse-resource-information.patch f0d44d88-add-missing-sle10-distros.patch - Dropped or renamed 0ae4f0db-add-missing-sles-distros.patch add-missing-sle10-distros.patch add-opensuse-leap-42.2-support.patch add-sle12sp2-support-for-arch.patch add-sle12sp2-support.patch Fix_derives-from_and_add_tablet_item.patch - bsc#1012005 - [openqa virtualization] using the wrong bootloader tool to boot the sles-12-sp3 pv kernel on xen platform add-sle12sp3-support.patch add-opensuse-leap-42.3-support.patch - fate#318394: Update virt-manager to the most current released version (requires libosinfo) OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=53 --- libosinfo.changes | 57 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/libosinfo.changes b/libosinfo.changes index 8ae6ba0..e8aaf4f 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,19 +1,5 @@ ------------------------------------------------------------------- -Tue Dec 6 16:32:18 MST 2016 - carnold@suse.com - -- bsc#1013983 - incomplete capabilities list of SLE and openSUSE - distributions in libosinfo - See osinfo-db package - -------------------------------------------------------------------- -Thu Dec 1 14:08:17 MST 2016 - carnold@suse.com - -- bsc#1012005 - [openqa virtualization] using the wrong bootloader - tool to boot the sles-12-sp3 pv kernel on xen platform - See osinfo-db package - -------------------------------------------------------------------- -Tue Oct 11 15:56:28 MDT 2016 - carnold@suse.com +Tue Dec 11 15:56:28 MDT 2016 - carnold@suse.com - Update to version 1.0.0 Changes in this release include: @@ -27,6 +13,39 @@ Tue Oct 11 15:56:28 MDT 2016 - carnold@suse.com add-sle12sp2-support.patch Fix_derives-from_and_add_tablet_item.patch +------------------------------------------------------------------- +Tue Dec 6 16:32:18 MST 2016 - carnold@suse.com + +- bsc#1013983 - incomplete capabilities list of SLE and openSUSE + distributions in libosinfo + 0ae4f0db-add-missing-sle12-distros.patch + 1a7ce161-add-sle-resource-information.patch + 3c621fd8-add-opensuse-date-information.patch + 470b7652-add-opensuse-device-information.patch + 50091807-add-sle-device-information.patch + 67c74e5f-add-opensuse-leap-42.2-support.patch + 99ae3d72-add-sle12sp2-support.patch + 99f7e666-fix-opensuse-derives-from-information.patch + 9a35cea7-fix-sle-derives-from-information.patch + 9dec2be8-add-sle-date-information.patch + e77abec7-add-opensuse-resource-information.patch + f0d44d88-add-missing-sle10-distros.patch +- Dropped or renamed + 0ae4f0db-add-missing-sles-distros.patch + add-missing-sle10-distros.patch + add-opensuse-leap-42.2-support.patch + add-sle12sp2-support-for-arch.patch + add-sle12sp2-support.patch + Fix_derives-from_and_add_tablet_item.patch + +------------------------------------------------------------------- +Thu Dec 1 14:08:17 MST 2016 - carnold@suse.com + +- bsc#1012005 - [openqa virtualization] using the wrong bootloader + tool to boot the sles-12-sp3 pv kernel on xen platform + add-sle12sp3-support.patch + add-opensuse-leap-42.3-support.patch + ------------------------------------------------------------------- Thu Oct 6 14:28:03 MDT 2016 - carnold@suse.com @@ -113,7 +132,7 @@ Tue Mar 15 16:07:47 MDT 2016 - carnold@suse.com add-tumbleweed-support.patch ------------------------------------------------------------------- -Tue Feb 3 11:44:59 MST 2016 - carnold@suse.com +Tue Feb 2 11:44:59 MST 2016 - carnold@suse.com - Add support for detecting Tumbleweed add-tumbleweed-support.patch @@ -212,6 +231,12 @@ Fri Jun 5 14:11:08 MDT 2015 - carnold@suse.com - Add support for openSUSE 13.2 1d08a23c-add-opensuse-13.2-support.patch +------------------------------------------------------------------- +Mon Jun 1 09:46:43 MDT 2015 - carnold@suse.com + +- fate#318394: Update virt-manager to the most current released + version (requires libosinfo) + ------------------------------------------------------------------- Thu May 28 08:00:18 UTC 2015 - zaitor@opensuse.org From d5da803394ff1cda74a633bf52baaafc75c0a4c627e7866d0c90fa98b6d1062f Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 24 Jan 2017 22:31:08 +0000 Subject: [PATCH 4/7] Fix timestamp on comment OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=54 --- libosinfo.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libosinfo.changes b/libosinfo.changes index e8aaf4f..3fdb745 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Dec 11 15:56:28 MDT 2016 - carnold@suse.com +Mon Dec 12 15:56:28 MDT 2016 - carnold@suse.com - Update to version 1.0.0 Changes in this release include: From 388690bb2e44360f8c264f944648423bcd28c746ad8ebcea7f1d4c2cdb7bdc4e Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 24 Jan 2017 23:14:59 +0000 Subject: [PATCH 5/7] Another modification to the changes log - Patches moved to osinfo-db package (dropped from libosinfo) 0ae4f0db-add-missing-sle12-distros.patch 1a7ce161-add-sle-resource-information.patch 3c621fd8-add-opensuse-date-information.patch 470b7652-add-opensuse-device-information.patch 50091807-add-sle-device-information.patch 67c74e5f-add-opensuse-leap-42.2-support.patch 99ae3d72-add-sle12sp2-support.patch 99f7e666-fix-opensuse-derives-from-information.patch 9a35cea7-fix-sle-derives-from-information.patch 9dec2be8-add-sle-date-information.patch e77abec7-add-opensuse-resource-information.patch f0d44d88-add-missing-sle10-distros.patch OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=55 --- libosinfo.changes | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libosinfo.changes b/libosinfo.changes index 3fdb745..909bffb 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -6,12 +6,19 @@ Mon Dec 12 15:56:28 MDT 2016 - carnold@suse.com - Update loader to follow new layout for external database - Move all database files into separate osinfo-db package - Move osinfo-db-validate into osinfo-db-tools package -- Patches moved to osinfo-db package (dropped) - add-missing-sle10-distros.patch - add-opensuse-leap-42.2-support.patch - add-sle12sp2-support-for-arch.patch - add-sle12sp2-support.patch - Fix_derives-from_and_add_tablet_item.patch +- Patches moved to osinfo-db package (dropped from libosinfo) + 0ae4f0db-add-missing-sle12-distros.patch + 1a7ce161-add-sle-resource-information.patch + 3c621fd8-add-opensuse-date-information.patch + 470b7652-add-opensuse-device-information.patch + 50091807-add-sle-device-information.patch + 67c74e5f-add-opensuse-leap-42.2-support.patch + 99ae3d72-add-sle12sp2-support.patch + 99f7e666-fix-opensuse-derives-from-information.patch + 9a35cea7-fix-sle-derives-from-information.patch + 9dec2be8-add-sle-date-information.patch + e77abec7-add-opensuse-resource-information.patch + f0d44d88-add-missing-sle10-distros.patch ------------------------------------------------------------------- Tue Dec 6 16:32:18 MST 2016 - carnold@suse.com From 945ad748d834bef157247fdb639aa34093c57d3555a06fe235233c500daccfc3 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 24 Jan 2017 23:28:26 +0000 Subject: [PATCH 6/7] - Update to version 1.0.0 (bsc#1013983) OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=56 --- libosinfo.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libosinfo.changes b/libosinfo.changes index 909bffb..cc4b03f 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Dec 12 15:56:28 MDT 2016 - carnold@suse.com -- Update to version 1.0.0 +- Update to version 1.0.0 (bsc#1013983) Changes in this release include: - Update loader to follow new layout for external database - Move all database files into separate osinfo-db package From c73af08e0bb9f175a864deb92a2a908cb9e47829819088a8aa5a260d2d0b9650 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 30 Jan 2017 20:10:49 +0000 Subject: [PATCH 7/7] Merge vala into the devel package OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=57 --- libosinfo.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/libosinfo.spec b/libosinfo.spec index 8bbea96..62dd9ea 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -80,18 +80,7 @@ determine the optimal device settings for a hypervisor/operating system combination. Libraries, includes, etc. to compile with the libosinfo library - -%package vala -Summary: Vala bindings -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description vala -libosinfo is a library that allows virtualization provisioning tools to -determine the optimal device settings for a hypervisor/operating system -combination. - -This package provides the Vala bindings for libosinfo library. +This package also provides the Vala bindings for libosinfo library. %if %{with_lang} %lang_package @@ -141,9 +130,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/pkgconfig/%{name}-1.0.pc %{_libdir}/libosinfo-1.0.so %{_datadir}/gir-1.0/Libosinfo-1.0.gir - -%files vala -%defattr(-, root, root) %dir %{_datadir}/vala/ %dir %{_datadir}/vala/vapi/ %{_datadir}/vala/vapi/libosinfo-1.0.vapi