From afca0cd37a08a2cfdc9d34bc612c2d37b86bbb8e7339b16b486896427ffd037c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Jul 2016 11:03:53 +0000 Subject: [PATCH] Accepting request 408252 from home:Zaitor:branches:hardware Rebased verbump OBS-URL: https://build.opensuse.org/request/show/408252 OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=49 --- 0ae4f0db-add-missing-sles-distros.patch | 303 -------------------- 92c55cab-add-missing-opensuse-distros.patch | 214 -------------- libosinfo-0.3.0.tar.gz | 3 - libosinfo-0.3.1.tar.gz | 3 + libosinfo.changes | 19 ++ libosinfo.spec | 20 +- 6 files changed, 30 insertions(+), 532 deletions(-) delete mode 100644 0ae4f0db-add-missing-sles-distros.patch delete mode 100644 92c55cab-add-missing-opensuse-distros.patch delete mode 100644 libosinfo-0.3.0.tar.gz create mode 100644 libosinfo-0.3.1.tar.gz diff --git a/0ae4f0db-add-missing-sles-distros.patch b/0ae4f0db-add-missing-sles-distros.patch deleted file mode 100644 index 008fbae..0000000 --- a/0ae4f0db-add-missing-sles-distros.patch +++ /dev/null @@ -1,303 +0,0 @@ -Subject: data: add missing SLES/SLED distro information -From: Charles Arnold carnold@suse.com Tue Mar 22 15:57:17 2016 -0600 -Date: Thu Mar 24 11:41:25 2016 +0100: -Git: 0ae4f0dbe8ce237c1dc8725acd1a0e30593622d4 - -Add missing SLES/SLED distro information. - -Added os data and isodata for the following distros: -SUSE Linux Enterprise Server 12 SP1 -SUSE Linux Enterprise Desktop 12 SP1 - -Added isodata for the following distros: -SUSE Linux Enterprise Server 11 SP4 -SUSE Linux Enterprise Desktop 11 SP4 - -diff --git a/data/os/suse.com/sled-12.1.xml.in b/data/os/suse.com/sled-12.1.xml.in -new file mode 100644 -index 0000000..1d0167f ---- /dev/null -+++ b/data/os/suse.com/sled-12.1.xml.in -@@ -0,0 +1,23 @@ -+ -+ -+ sled12sp1 -+ <_name>SUSE Linux Enterprise Desktop 12 SP1 -+ 12.1 -+ <_vendor>SUSE -+ linux -+ sled -+ -+ -+ -+ 2015-12-18 -+ -+ -+ -+ LINUX -+ SLE-12-SP1-Desktop-DVD-x86_64* -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -diff --git a/data/os/suse.com/sles-12.1.xml.in b/data/os/suse.com/sles-12.1.xml.in -new file mode 100644 -index 0000000..5956ce1 ---- /dev/null -+++ b/data/os/suse.com/sles-12.1.xml.in -@@ -0,0 +1,23 @@ -+ -+ -+ sles12sp1 -+ <_name>SUSE Linux Enterprise Server 12 SP1 -+ 12.1 -+ <_vendor>SUSE -+ linux -+ sles -+ -+ -+ -+ 2015-12-18 -+ -+ -+ -+ LINUX -+ SLE-12-SP1-Server-DVD-x86_64* -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 3698ef8..9097b71 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -304,6 +304,7 @@ data/os/suse.com/sled-11.3.xml.in - data/os/suse.com/sled-11.4.xml.in - data/os/suse.com/sled-11.xml.in - data/os/suse.com/sled-12.xml.in -+data/os/suse.com/sled-12.1.xml.in - data/os/suse.com/sles-9.xml.in - data/os/suse.com/sles-10.xml.in - data/os/suse.com/sles-11.1.xml.in -@@ -312,6 +313,7 @@ data/os/suse.com/sles-11.3.xml.in - data/os/suse.com/sles-11.4.xml.in - data/os/suse.com/sles-11.xml.in - data/os/suse.com/sles-12.xml.in -+data/os/suse.com/sles-12.1.xml.in - data/os/ubuntu.com/ubuntu-4.10.xml.in - data/os/ubuntu.com/ubuntu-5.04.xml.in - data/os/ubuntu.com/ubuntu-5.10.xml.in -diff --git a/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt -new file mode 100644 -index 0000000..9e704fd ---- /dev/null -+++ b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SLED-11-SP4-DVD-i58610211 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: SLED-11-SP4-DVD-i586-Build1021-Media1 -+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: 2204975 -+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 218 536 -diff --git a/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt -new file mode 100644 -index 0000000..fd876a0 ---- /dev/null -+++ b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SLED-11-SP4-DVD-x86_6410211 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: SLED-11-SP4-DVD-x86_64-Build1021-Media1 -+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: 2266410 -+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 146A 5226 -diff --git a/test/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt -new file mode 100644 -index 0000000..09f89d1 ---- /dev/null -+++ b/test/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SLE-12-SP1-Desktop-DVD-x86_64343 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: SLE-12-SP1-Desktop-DVD-x86_64-Build3432-Media1 -+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: 2246625 -+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 14F0 5360 -diff --git a/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt -new file mode 100644 -index 0000000..e4220a1 ---- /dev/null -+++ b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SLES-11-SP4-DVD-i58612211 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: SLES-11-SP4-DVD-i586-Build1221-Media1 -+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: 1578152 -+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 1AD 429 -diff --git a/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt -new file mode 100644 -index 0000000..0580ae4 ---- /dev/null -+++ b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SLES-11-SP4-DVD-x86_6412211 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: SLES-11-SP4-DVD-x86_64-Build1221-Media1 -+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: 1652460 -+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 13A2 5026 -diff --git a/test/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt -new file mode 100644 -index 0000000..b0d8723 ---- /dev/null -+++ b/test/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: SLE-12-SP1-Server-DVD-x86_643247 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: SLE-12-SP1-Server-DVD-x86_64-Build3247-Media1 -+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: 1547794 -+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 14C6 5318 diff --git a/92c55cab-add-missing-opensuse-distros.patch b/92c55cab-add-missing-opensuse-distros.patch deleted file mode 100644 index d5366e1..0000000 --- a/92c55cab-add-missing-opensuse-distros.patch +++ /dev/null @@ -1,214 +0,0 @@ -Subject: data: add missing openSUSE distro information -From: Charles Arnold carnold@suse.com Tue Mar 22 15:56:09 2016 -0600 -Date: Thu Mar 24 11:44:18 2016 +0100: -Git: 92c55cab6b219d1f4e7e360f92e2562d016b81d5 - -Add missing openSUSE distro information. - -Added os data and isodata for the following distros: -openSUSE Leap 42.1 -openSUSE Tumbleweed - -diff --git a/data/os/opensuse.org/opensuse-42.1.xml.in b/data/os/opensuse.org/opensuse-42.1.xml.in -new file mode 100644 -index 0000000..e116de0 ---- /dev/null -+++ b/data/os/opensuse.org/opensuse-42.1.xml.in -@@ -0,0 +1,25 @@ -+ -+ -+ opensuse42.1 -+ <_name>openSUSE Leap 42.1 -+ 42.1 -+ <_vendor>openSUSE -+ linux -+ opensuse -+ -+ -+ -+ 2015-11-04 -+ -+ -+ http://download.opensuse.org/distribution/leap/42.1/iso/openSUSE-Leap-42.1-DVD-x86_64.iso -+ -+ openSUSE-Leap-42.1-DVD-x86_64026 -+ LINUX -+ SUSE LINUX GmbH -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in -new file mode 100644 -index 0000000..99b2fbc ---- /dev/null -+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in -@@ -0,0 +1,48 @@ -+ -+ -+ opensusetumbleweed -+ <_name>openSUSE Tumbleweed -+ tumbleweed -+ <_vendor>openSUSE -+ linux -+ opensuse -+ -+ -+ -+ -+ http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso -+ -+ openSUSE-Tumbleweed-DVD-i586* -+ LINUX -+ SUSE LINUX GmbH -+ -+ boot/i386/loader/linux -+ boot/i386/loader/initrd -+ -+ -+ http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso -+ -+ openSUSE-Tumbleweed-DVD-x86_64* -+ LINUX -+ SUSE LINUX GmbH -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -+ -+ -+ 500000000 -+ 1 -+ 1073741824 -+ 3221225472 -+ -+ -+ 2400000000 -+ 2147483648 -+ 5368709120 -+ -+ -+ -+ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 9097b71..fecdd95 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -217,6 +217,8 @@ data/os/opensuse.org/opensuse-12.2.xml.in - data/os/opensuse.org/opensuse-12.3.xml.in - data/os/opensuse.org/opensuse-13.1.xml.in - data/os/opensuse.org/opensuse-13.2.xml.in -+data/os/opensuse.org/opensuse-42.1.xml.in -+data/os/opensuse.org/opensuse-tumbleweed.xml.in - data/os/opensuse.org/opensuse-factory.xml.in - data/os/opensuse.org/opensuse-unknown.xml.in - data/os/oracle.com/solaris-11.xml.in -diff --git a/test/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt b/test/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt -new file mode 100644 -index 0000000..da37cd6 ---- /dev/null -+++ b/test/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: openSUSE-Leap-42.1-DVD-x86_64026 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: openSUSE-Leap-42.1-DVD-x86_64-Build0265-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: 2269201 -+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 1628 5672 -diff --git a/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt -new file mode 100644 -index 0000000..c96327c ---- /dev/null -+++ b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: openSUSE-Tumbleweed-DVD-i5860005 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: openSUSE-Tumbleweed-DVD-i586-Build0005-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: 2008612 -+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 363 867 -diff --git a/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt -new file mode 100644 -index 0000000..ac95688 ---- /dev/null -+++ b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt -@@ -0,0 +1,29 @@ -+CD-ROM is in ISO 9660 format -+System id: LINUX -+Volume id: openSUSE-Tumbleweed-DVD-x86_6400 -+Volume set id: -+Publisher id: SUSE LINUX GmbH -+Data preparer id: KIWI - http://opensuse.github.com/kiwi -+Application id: openSUSE-Tumbleweed-DVD-x86_64-Build0004-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: 2250813 -+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 160A 5642 diff --git a/libosinfo-0.3.0.tar.gz b/libosinfo-0.3.0.tar.gz deleted file mode 100644 index 3a434d1..0000000 --- a/libosinfo-0.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:538a3468792e919edf5364fe102d751353ae600a92ad3a24f024424a182cefbc -size 1816516 diff --git a/libosinfo-0.3.1.tar.gz b/libosinfo-0.3.1.tar.gz new file mode 100644 index 0000000..0c69fc9 --- /dev/null +++ b/libosinfo-0.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50b272943d68b77d5259f72be860acfd048126bc27e7aa9c2f9c77a7eacf3894 +size 1839185 diff --git a/libosinfo.changes b/libosinfo.changes index d5eb843..5089ff9 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Jul 2 11:56:46 UTC 2016 - zaitor@opensuse.org + +- Update to version 0.3.1: + + Require glib2 >= 2.36. + + Replace GSimpleAsyncResult usage with GTask. + + Fix VPATH based builds. + + Don't include autogenerated enum files in dist. + + Fix build with older GCC versions. + + Add/improve/fix data for: Debian, SLES/SLED, OpenSUSE, FreeBSD, + Windows, RHEL, Ubuntu. + + Update README content. + + Fix string comparison for bootable media detection. + + Fix linker flags for OS-X & solaris. + + Fix darwin detection code. + + Fix multiple memory leaks. +- Drop 0ae4f0db-add-missing-sles-distros.patch and + 92c55cab-add-missing-opensuse-distros.patch: Fixed upstream. + ------------------------------------------------------------------- Mon Jun 27 15:45:49 MDT 2016 - carnold@suse.com diff --git a/libosinfo.spec b/libosinfo.spec index 68ffe7e..8bad33a 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -20,7 +20,7 @@ %define with_lang 1 Name: libosinfo -Version: 0.3.0 +Version: 0.3.1 Release: 0 Summary: Manage information about operating systems and hypervisors License: LGPL-2.1+ and GPL-2.0+ @@ -28,17 +28,15 @@ Group: System/Libraries Url: http://libosinfo.org/ Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz Source1: ids.tar.bz2 -Patch1: 0ae4f0db-add-missing-sles-distros.patch -Patch2: 92c55cab-add-missing-opensuse-distros.patch -Patch10: Fix_derives-from_and_add_tablet_item.patch -Patch11: add-sle12sp2-support.patch -Patch12: add-missing-sle10-distros.patch -Patch13: add-opensuse-leap-42.2-support.patch +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) +BuildRequires: pkgconfig(gio-2.0) >= 2.36 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libsoup-2.4) @@ -98,12 +96,10 @@ the API is available in all common programming languages. %endif %prep %setup -q -a 1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 +%patch3 -p1 %build %configure \