diff options
| -rw-r--r-- | libre/libosinfo/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/libosinfo/libre.patch | 851 |
2 files changed, 689 insertions, 178 deletions
diff --git a/libre/libosinfo/PKGBUILD b/libre/libosinfo/PKGBUILD index 8449870d0..8f2133de6 100644 --- a/libre/libosinfo/PKGBUILD +++ b/libre/libosinfo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 135179 2015-06-11 01:12:35Z bgyorgy $ +# $Id: PKGBUILD 159646 2016-01-31 03:46:54Z bgyorgy $ # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com> # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Daniel Milewski <niitotantei@gmail.com> pkgname=libosinfo -pkgver=0.2.12 +pkgver=0.3.0 pkgrel=1.parabola1 pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://libosinfo.org/" license=('GPL' 'LGPL') depends=('glib2' 'libxslt') @@ -18,17 +18,13 @@ replaces=(${pkgname}-libre) options=('!libtool') source=(https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$pkgver.tar.gz libre.patch) -sha256sums=('fa00ea8ddbca06c0dcc31e8938ac55cb71e71c6e2449687cd2c9e003a9478fed' - '3047de165ea5da486efdbb4836331f4890036908f372f82abe2c025a627d77a3') +sha256sums=('538a3468792e919edf5364fe102d751353ae600a92ad3a24f024424a182cefbc' + 'a74ec92c664d4eb5856ea30fa081b803390077aa4aced524cea85a71a8e16799') prepare() { cd $pkgname-$pkgver - rm data/datamaps/windows-lang.xml \ - data/hypervisors/rhel-xen.xml{,.in} \ - data/install-scripts/*.xml \ - data/oses/*.xml{,.in} - rm -r test/isodata/* + rm -rv {data/{datamap/microsoft.com,os,install-script},docs,test/isodata/*} patch -Np1 -i ../libre.patch diff --git a/libre/libosinfo/libre.patch b/libre/libosinfo/libre.patch index ee59878c7..5d79a87df 100644 --- a/libre/libosinfo/libre.patch +++ b/libre/libosinfo/libre.patch @@ -1,185 +1,681 @@ -diff -Nur libosinfo-0.2.11.orig/data/datamaps/Makefile.am libosinfo-0.2.11/data/datamaps/Makefile.am ---- libosinfo-0.2.11.orig/data/datamaps/Makefile.am 2013-11-21 13:58:04.000000000 -0200 -+++ libosinfo-0.2.11/data/datamaps/Makefile.am 2014-09-23 12:19:00.894413914 -0300 -@@ -1,7 +1,6 @@ +diff -Nur libosinfo-0.3.0.orig/Makefile.am libosinfo-0.3.0/Makefile.am +--- libosinfo-0.3.0.orig/Makefile.am 2015-11-23 12:53:52.000000000 -0300 ++++ libosinfo-0.3.0/Makefile.am 2016-02-01 03:05:01.273531497 -0300 +@@ -1,5 +1,5 @@ - datamapdir = $(pkgdatadir)/db/datamaps/ - datamap_DATA = \ -- windows-lang.xml \ - x11-keyboard.xml \ - $(NULL) +-SUBDIRS = osinfo data test tools docs po examples ++SUBDIRS = osinfo data test tools po examples -diff -Nur libosinfo-0.2.11.orig/data/datamaps/Makefile.in libosinfo-0.2.11/data/datamaps/Makefile.in ---- libosinfo-0.2.11.orig/data/datamaps/Makefile.in 2014-08-19 10:16:02.000000000 -0300 -+++ libosinfo-0.2.11/data/datamaps/Makefile.in 2014-09-23 12:19:00.894413914 -0300 -@@ -331,7 +331,6 @@ + INTLTOOL_FILES = \ + intltool-extract.in \ +diff -Nur libosinfo-0.3.0.orig/Makefile.in libosinfo-0.3.0/Makefile.in +--- libosinfo-0.3.0.orig/Makefile.in 2016-01-08 16:21:30.000000000 -0300 ++++ libosinfo-0.3.0/Makefile.in 2016-02-01 03:05:25.622271347 -0300 +@@ -396,7 +396,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - datamapdir = $(pkgdatadir)/db/datamaps/ - datamap_DATA = \ -- windows-lang.xml \ - x11-keyboard.xml \ - $(NULL) +-SUBDIRS = osinfo data test tools docs po examples ++SUBDIRS = osinfo data test tools po examples + INTLTOOL_FILES = \ + intltool-extract.in \ + intltool-merge.in \ +diff -Nur libosinfo-0.3.0.orig/configure libosinfo-0.3.0/configure +--- libosinfo-0.3.0.orig/configure 2016-01-08 16:21:29.000000000 -0300 ++++ libosinfo-0.3.0/configure 2016-02-01 09:21:24.181853612 -0300 +@@ -15583,7 +15583,7 @@ + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -diff -Nur libosinfo-0.2.11.orig/data/hypervisors/Makefile.am libosinfo-0.2.11/data/hypervisors/Makefile.am ---- libosinfo-0.2.11.orig/data/hypervisors/Makefile.am 2013-11-21 13:58:04.000000000 -0200 -+++ libosinfo-0.2.11/data/hypervisors/Makefile.am 2014-09-23 12:19:00.894413914 -0300 -@@ -1,6 +1,6 @@ - databasedir = $(pkgdatadir)/db/hypervisors/ --database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in -+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in +-ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h data/Makefile data/datamap/Makefile data/datamap/microsoft.com/Makefile data/datamap/x.org/Makefile data/device/Makefile data/device/ibasetechnologies.net/Makefile data/device/ibm.com/Makefile data/device/pcisig.com/Makefile data/device/pcisig.com/pci-1000-0012.d/Makefile data/device/pcisig.com/pci-1013-00b8.d/Makefile data/device/pcisig.com/pci-1022-2000.d/Makefile data/device/pcisig.com/pci-10ec-8029.d/Makefile data/device/pcisig.com/pci-10ec-8139.d/Makefile data/device/pcisig.com/pci-1234-1111.d/Makefile data/device/pcisig.com/pci-1274-5000.d/Makefile data/device/pcisig.com/pci-15ad-0710.d/Makefile data/device/pcisig.com/pci-1af4-1000.d/Makefile data/device/pcisig.com/pci-1af4-1001.d/Makefile data/device/pcisig.com/pci-1af4-1002.d/Makefile data/device/pcisig.com/pci-1af4-1003.d/Makefile data/device/pcisig.com/pci-1af4-1009.d/Makefile data/device/pcisig.com/pci-1b36-0100.d/Makefile data/device/pcisig.com/pci-8086-100e.d/Makefile data/device/pcisig.com/pci-8086-2415.d/Makefile data/device/pcisig.com/pci-8086-25ab.d/Makefile data/device/pcisig.com/pci-8086-2668.d/Makefile data/device/usb.org/Makefile data/device/usb.org/usb-80ee-0021.d/Makefile data/device/xen.org/Makefile data/platform/Makefile data/platform/linux-kvm.org/Makefile data/platform/qemu.org/Makefile data/platform/redhat.com/Makefile data/platform/xen.org/Makefile data/install-script/Makefile data/install-script/debian.org/Makefile data/install-script/fedoraproject.org/Makefile data/install-script/microsoft.com/Makefile data/install-script/redhat.com/Makefile data/install-script/ubuntu.com/Makefile data/os/Makefile data/os/altlinux.org/Makefile data/os/apple.com/Makefile data/os/centos.org/Makefile data/os/debian.org/Makefile data/os/fedoraproject.org/Makefile data/os/freebsd.org/Makefile data/os/gnome.org/Makefile data/os/mageia.org/Makefile data/os/mandriva.com/Makefile data/os/microsoft.com/Makefile data/os/netbsd.org/Makefile data/os/novell.com/Makefile data/os/openbsd.org/Makefile data/os/opensuse.org/Makefile data/os/oracle.com/Makefile data/os/redhat.com/Makefile data/os/sun.com/Makefile data/os/suse.com/Makefile data/os/ubuntu.com/Makefile data/schemas/Makefile tools/Makefile test/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in" ++ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h data/Makefile data/datamap/Makefile data/datamap/x.org/Makefile data/device/Makefile data/device/ibasetechnologies.net/Makefile data/device/ibm.com/Makefile data/device/pcisig.com/Makefile data/device/pcisig.com/pci-1000-0012.d/Makefile data/device/pcisig.com/pci-1013-00b8.d/Makefile data/device/pcisig.com/pci-1022-2000.d/Makefile data/device/pcisig.com/pci-10ec-8029.d/Makefile data/device/pcisig.com/pci-10ec-8139.d/Makefile data/device/pcisig.com/pci-1234-1111.d/Makefile data/device/pcisig.com/pci-1274-5000.d/Makefile data/device/pcisig.com/pci-15ad-0710.d/Makefile data/device/pcisig.com/pci-1af4-1000.d/Makefile data/device/pcisig.com/pci-1af4-1001.d/Makefile data/device/pcisig.com/pci-1af4-1002.d/Makefile data/device/pcisig.com/pci-1af4-1003.d/Makefile data/device/pcisig.com/pci-1af4-1009.d/Makefile data/device/pcisig.com/pci-1b36-0100.d/Makefile data/device/pcisig.com/pci-8086-100e.d/Makefile data/device/pcisig.com/pci-8086-2415.d/Makefile data/device/pcisig.com/pci-8086-25ab.d/Makefile data/device/pcisig.com/pci-8086-2668.d/Makefile data/device/usb.org/Makefile data/device/usb.org/usb-80ee-0021.d/Makefile data/device/xen.org/Makefile data/platform/Makefile data/platform/linux-kvm.org/Makefile data/platform/qemu.org/Makefile data/platform/xen.org/Makefile data/schemas/Makefile tools/Makefile test/Makefile examples/Makefile po/Makefile.in" - database_DATA = $(database_in_files:.xml.in=.xml) + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -16672,7 +16672,6 @@ + "osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;; + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/datamap/Makefile") CONFIG_FILES="$CONFIG_FILES data/datamap/Makefile" ;; +- "data/datamap/microsoft.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/datamap/microsoft.com/Makefile" ;; + "data/datamap/x.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/datamap/x.org/Makefile" ;; + "data/device/Makefile") CONFIG_FILES="$CONFIG_FILES data/device/Makefile" ;; + "data/device/ibasetechnologies.net/Makefile") CONFIG_FILES="$CONFIG_FILES data/device/ibasetechnologies.net/Makefile" ;; +@@ -16702,39 +16701,10 @@ + "data/platform/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/Makefile" ;; + "data/platform/linux-kvm.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/linux-kvm.org/Makefile" ;; + "data/platform/qemu.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/qemu.org/Makefile" ;; +- "data/platform/redhat.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/redhat.com/Makefile" ;; + "data/platform/xen.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/xen.org/Makefile" ;; +- "data/install-script/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/Makefile" ;; +- "data/install-script/debian.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/debian.org/Makefile" ;; +- "data/install-script/fedoraproject.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/fedoraproject.org/Makefile" ;; +- "data/install-script/microsoft.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/microsoft.com/Makefile" ;; +- "data/install-script/redhat.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/redhat.com/Makefile" ;; +- "data/install-script/ubuntu.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/ubuntu.com/Makefile" ;; +- "data/os/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/Makefile" ;; +- "data/os/altlinux.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/altlinux.org/Makefile" ;; +- "data/os/apple.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/apple.com/Makefile" ;; +- "data/os/centos.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/centos.org/Makefile" ;; +- "data/os/debian.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/debian.org/Makefile" ;; +- "data/os/fedoraproject.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/fedoraproject.org/Makefile" ;; +- "data/os/freebsd.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/freebsd.org/Makefile" ;; +- "data/os/gnome.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/gnome.org/Makefile" ;; +- "data/os/mageia.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/mageia.org/Makefile" ;; +- "data/os/mandriva.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/mandriva.com/Makefile" ;; +- "data/os/microsoft.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/microsoft.com/Makefile" ;; +- "data/os/netbsd.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/netbsd.org/Makefile" ;; +- "data/os/novell.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/novell.com/Makefile" ;; +- "data/os/openbsd.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/openbsd.org/Makefile" ;; +- "data/os/opensuse.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/opensuse.org/Makefile" ;; +- "data/os/oracle.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/oracle.com/Makefile" ;; +- "data/os/redhat.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/redhat.com/Makefile" ;; +- "data/os/sun.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/sun.com/Makefile" ;; +- "data/os/suse.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/suse.com/Makefile" ;; +- "data/os/ubuntu.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/ubuntu.com/Makefile" ;; + "data/schemas/Makefile") CONFIG_FILES="$CONFIG_FILES data/schemas/Makefile" ;; + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; +- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; +- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; +diff -Nur libosinfo-0.3.0.orig/configure.ac libosinfo-0.3.0/configure.ac +--- libosinfo-0.3.0.orig/configure.ac 2016-01-07 14:38:22.000000000 -0300 ++++ libosinfo-0.3.0/configure.ac 2016-02-01 07:03:00.826903158 -0300 +@@ -222,7 +222,6 @@ + osinfo/osinfo_version.h + data/Makefile + data/datamap/Makefile +- data/datamap/microsoft.com/Makefile + data/datamap/x.org/Makefile + data/device/Makefile + data/device/ibasetechnologies.net/Makefile +@@ -252,39 +251,10 @@ + data/platform/Makefile + data/platform/linux-kvm.org/Makefile + data/platform/qemu.org/Makefile +- data/platform/redhat.com/Makefile + data/platform/xen.org/Makefile +- data/install-script/Makefile +- data/install-script/debian.org/Makefile +- data/install-script/fedoraproject.org/Makefile +- data/install-script/microsoft.com/Makefile +- data/install-script/redhat.com/Makefile +- data/install-script/ubuntu.com/Makefile +- data/os/Makefile +- data/os/altlinux.org/Makefile +- data/os/apple.com/Makefile +- data/os/centos.org/Makefile +- data/os/debian.org/Makefile +- data/os/fedoraproject.org/Makefile +- data/os/freebsd.org/Makefile +- data/os/gnome.org/Makefile +- data/os/mageia.org/Makefile +- data/os/mandriva.com/Makefile +- data/os/microsoft.com/Makefile +- data/os/netbsd.org/Makefile +- data/os/novell.com/Makefile +- data/os/openbsd.org/Makefile +- data/os/opensuse.org/Makefile +- data/os/oracle.com/Makefile +- data/os/redhat.com/Makefile +- data/os/sun.com/Makefile +- data/os/suse.com/Makefile +- data/os/ubuntu.com/Makefile + data/schemas/Makefile + tools/Makefile + test/Makefile +- docs/Makefile +- docs/reference/Makefile + examples/Makefile + po/Makefile.in + ]) +diff -Nur libosinfo-0.3.0.orig/data/Makefile.am libosinfo-0.3.0/data/Makefile.am +--- libosinfo-0.3.0.orig/data/Makefile.am 2015-11-23 12:53:52.000000000 -0300 ++++ libosinfo-0.3.0/data/Makefile.am 2016-02-01 02:51:45.341373097 -0300 +@@ -1,5 +1,5 @@ -diff -Nur libosinfo-0.2.11.orig/data/hypervisors/Makefile.in libosinfo-0.2.11/data/hypervisors/Makefile.in ---- libosinfo-0.2.11.orig/data/hypervisors/Makefile.in 2014-08-19 10:16:02.000000000 -0300 -+++ libosinfo-0.2.11/data/hypervisors/Makefile.in 2014-09-23 12:19:00.894413914 -0300 -@@ -330,7 +330,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - databasedir = $(pkgdatadir)/db/hypervisors/ --database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in -+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in - database_DATA = $(database_in_files:.xml.in=.xml) - EXTRA_DIST = $(database_in_files) $(database_DATA) - all: all-am -diff -Nur libosinfo-0.2.11.orig/data/install-scripts/Makefile.am libosinfo-0.2.11/data/install-scripts/Makefile.am ---- libosinfo-0.2.11.orig/data/install-scripts/Makefile.am 2014-04-23 11:25:33.000000000 -0300 -+++ libosinfo-0.2.11/data/install-scripts/Makefile.am 2014-09-23 12:19:00.897747271 -0300 -@@ -1,14 +1,6 @@ +-SUBDIRS = datamap device os platform install-script schemas ++SUBDIRS = datamap device platform schemas - databasedir = $(pkgdatadir)/db/install-scripts/ - database_DATA = \ -- debian.xml \ -- fedora.xml \ -- rhel.xml \ -- ubuntu.xml \ -- windows-sif.xml \ -- windows-cmd.xml \ -- windows-reg.xml \ -- windows-unattend.xml \ - $(NULL) + CLEANFILES = - EXTRA_DIST = $(database_DATA) -diff -Nur libosinfo-0.2.11.orig/data/install-scripts/Makefile.in libosinfo-0.2.11/data/install-scripts/Makefile.in ---- libosinfo-0.2.11.orig/data/install-scripts/Makefile.in 2014-08-19 10:16:02.000000000 -0300 -+++ libosinfo-0.2.11/data/install-scripts/Makefile.in 2014-09-23 12:19:00.897747271 -0300 -@@ -331,14 +331,6 @@ +diff -Nur libosinfo-0.3.0.orig/data/Makefile.in libosinfo-0.3.0/data/Makefile.in +--- libosinfo-0.3.0.orig/data/Makefile.in 2016-01-08 16:21:30.000000000 -0300 ++++ libosinfo-0.3.0/data/Makefile.in 2016-02-01 02:52:21.576166080 -0300 +@@ -398,7 +398,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - databasedir = $(pkgdatadir)/db/install-scripts/ - database_DATA = \ -- debian.xml \ -- fedora.xml \ -- rhel.xml \ -- ubuntu.xml \ -- windows-sif.xml \ -- windows-cmd.xml \ -- windows-reg.xml \ -- windows-unattend.xml \ - $(NULL) +-SUBDIRS = datamap device os platform install-script schemas ++SUBDIRS = datamap device platform schemas + CLEANFILES = $(am__append_1) $(am__append_2) + @LOCAL_USB_IDS_TRUE@usb_database_DATA = usb.ids + @LOCAL_USB_IDS_TRUE@usb_databasedir = $(pkgdatadir)/ +diff -Nur libosinfo-0.3.0.orig/data/datamap/Makefile.am libosinfo-0.3.0/data/datamap/Makefile.am +--- libosinfo-0.3.0.orig/data/datamap/Makefile.am 2015-11-23 12:53:52.000000000 -0300 ++++ libosinfo-0.3.0/data/datamap/Makefile.am 2016-02-01 02:49:24.458657289 -0300 +@@ -1,5 +1,4 @@ - EXTRA_DIST = $(database_DATA) -diff -Nur libosinfo-0.2.11.orig/data/oses/Makefile.am libosinfo-0.2.11/data/oses/Makefile.am ---- libosinfo-0.2.11.orig/data/oses/Makefile.am 2014-08-07 12:30:56.000000000 -0300 -+++ libosinfo-0.2.11/data/oses/Makefile.am 2014-09-23 12:20:49.001854757 -0300 -@@ -1,27 +1,6 @@ - - databasedir = $(pkgdatadir)/db/oses/ - database_in_files = \ -- altlinux.xml.in \ -- centos.xml.in \ -- debian.xml.in \ -- dos.xml.in \ -- fedora.xml.in \ -- freebsd.xml.in \ -- gnome.xml.in \ -- mageia.xml.in \ -- mandriva.xml.in \ -- mandrake.xml.in \ -- netbsd.xml.in \ -- netware.xml.in \ -- macos.xml.in \ -- openbsd.xml.in \ -- opensuse.xml.in \ -- rhl.xml.in \ -- rhel.xml.in \ -- solaris.xml.in \ -- suse.xml.in \ -- ubuntu.xml.in \ -- windows.xml.in \ + SUBDIRS = \ +- microsoft.com \ + x.org \ $(NULL) - - database_DATA = $(database_in_files:.xml.in=.xml) -diff -Nur libosinfo-0.2.11.orig/data/oses/Makefile.in libosinfo-0.2.11/data/oses/Makefile.in ---- libosinfo-0.2.11.orig/data/oses/Makefile.in 2014-08-19 10:16:02.000000000 -0300 -+++ libosinfo-0.2.11/data/oses/Makefile.in 2014-09-23 12:19:00.897747271 -0300 -@@ -331,27 +331,6 @@ +diff -Nur libosinfo-0.3.0.orig/data/datamap/Makefile.in libosinfo-0.3.0/data/datamap/Makefile.in +--- libosinfo-0.3.0.orig/data/datamap/Makefile.in 2016-01-08 16:21:30.000000000 -0300 ++++ libosinfo-0.3.0/data/datamap/Makefile.in 2016-02-01 02:49:34.038162031 -0300 +@@ -366,7 +366,6 @@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - databasedir = $(pkgdatadir)/db/oses/ - database_in_files = \ -- altlinux.xml.in \ -- centos.xml.in \ -- debian.xml.in \ -- dos.xml.in \ -- fedora.xml.in \ -- freebsd.xml.in \ -- gnome.xml.in \ -- mageia.xml.in \ -- mandriva.xml.in \ -- mandrake.xml.in \ -- netbsd.xml.in \ -- netware.xml.in \ -- macos.xml.in \ -- openbsd.xml.in \ -- opensuse.xml.in \ -- rhl.xml.in \ -- rhel.xml.in \ -- solaris.xml.in \ -- suse.xml.in \ -- ubuntu.xml.in \ -- windows.xml.in \ + SUBDIRS = \ +- microsoft.com \ + x.org \ $(NULL) - database_DATA = $(database_in_files:.xml.in=.xml) -diff -Nur libosinfo-0.2.11.orig/po/POTFILES.in libosinfo-0.2.11/po/POTFILES.in ---- libosinfo-0.2.11.orig/po/POTFILES.in 2014-04-23 11:25:33.000000000 -0300 -+++ libosinfo-0.2.11/po/POTFILES.in 2014-09-23 12:19:00.897747271 -0300 -@@ -1,31 +1,9 @@ --data/oses/netware.xml.in --data/oses/solaris.xml.in --data/oses/dos.xml.in --data/oses/mageia.xml.in --data/oses/mandrake.xml.in --data/oses/mandriva.xml.in --data/oses/suse.xml.in --data/oses/gnome.xml.in --data/oses/rhel.xml.in --data/oses/fedora.xml.in --data/oses/windows.xml.in --data/oses/opensuse.xml.in --data/oses/macos.xml.in --data/oses/debian.xml.in --data/oses/ubuntu.xml.in --data/oses/centos.xml.in --data/oses/openbsd.xml.in --data/oses/freebsd.xml.in --data/oses/rhl.xml.in --data/oses/netbsd.xml.in --data/oses/altlinux.xml.in - data/devices/qemu-ps2.xml.in - data/devices/qemu-pci.xml.in - data/devices/virtio-pci.xml.in - data/devices/qemu-usb.xml.in - data/hypervisors/kvm.xml.in - data/hypervisors/qemu.xml.in --data/hypervisors/rhel-xen.xml.in - data/hypervisors/xen.xml.in - osinfo/osinfo_avatar_format.c - osinfo/osinfo_deployment.c -diff -Nur libosinfo-0.2.12.orig/test/test-isodetect.c libosinfo-0.2.12/test/test-isodetect.c ---- libosinfo-0.2.12.orig/test/test-isodetect.c 2015-05-26 14:07:49.000000000 -0300 -+++ libosinfo-0.2.12/test/test-isodetect.c 2015-06-11 06:45:42.619777722 -0300 -@@ -352,84 +352,6 @@ +diff -Nur libosinfo-0.3.0.orig/data/platform/Makefile.am libosinfo-0.3.0/data/platform/Makefile.am +--- libosinfo-0.3.0.orig/data/platform/Makefile.am 2015-11-23 12:53:52.000000000 -0300 ++++ libosinfo-0.3.0/data/platform/Makefile.am 2016-02-01 02:53:11.903563539 -0300 +@@ -2,6 +2,5 @@ + SUBDIRS = \ + linux-kvm.org \ + qemu.org \ +- redhat.com \ + xen.org \ + $(NULL) +diff -Nur libosinfo-0.3.0.orig/data/platform/Makefile.in libosinfo-0.3.0/data/platform/Makefile.in +--- libosinfo-0.3.0.orig/data/platform/Makefile.in 2016-01-08 16:21:31.000000000 -0300 ++++ libosinfo-0.3.0/data/platform/Makefile.in 2016-02-01 02:53:40.835400673 -0300 +@@ -368,7 +368,6 @@ + SUBDIRS = \ + linux-kvm.org \ + qemu.org \ +- redhat.com \ + xen.org \ + $(NULL) + +diff -Nur libosinfo-0.3.0.orig/examples/demo.js libosinfo-0.3.0/examples/demo.js +--- libosinfo-0.3.0.orig/examples/demo.js 2015-08-17 12:19:22.000000000 -0300 ++++ libosinfo-0.3.0/examples/demo.js 2016-02-01 03:09:57.361539021 -0300 +@@ -32,7 +32,7 @@ + print (" OS short id " + name) + } + +-var osid = "http://fedoraproject.org/fedora-11" ++var osid = "https://wiki.parabola.nu/Get_Parabola" + var hvid = "http://qemu.org/qemu-kvm-0.11.0" + var drvclass = "net" + //var drvclass = "audio" +diff -Nur libosinfo-0.3.0.orig/examples/libosinfo-dummy-data.xml libosinfo-0.3.0/examples/libosinfo-dummy-data.xml +--- libosinfo-0.3.0.orig/examples/libosinfo-dummy-data.xml 2015-08-17 12:19:22.000000000 -0300 ++++ libosinfo-0.3.0/examples/libosinfo-dummy-data.xml 2016-02-01 03:12:45.199516344 -0300 +@@ -64,87 +64,11 @@ + </devices> + </platform> + +-<os id="http://fedoraproject.org/fedora-11"> +- <upgrades id="http://fedoraproject.org/fedora-10" /> +- <short-id>fedora11</short-id> +- <name>Fedora 11</name> +- <version>11</version> +- <vendor>Fedora Project</vendor> +- <x-fruit>apples</x-fruit> +- <x-animal>marmot</x-animal> +- <x-animal>aardvark</x-animal> +- +- <!-- Device support for unspecified platform --> +- <devices> +- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382"> +- <driver>es1391</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000"> +- <driver>ac97+</driver> +- </device> +- </devices> +-</os> +- +-<os id="http://fedoraproject.org/fedora-10"> +- <short-id>fedora10</short-id> +- <name>Fedora 10</name> +- <version>10</version> +- <vendor>Fedora Project</vendor> +- +- <!-- Device support for unspecified platform --> +- <devices> +- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000"> +- <driver>ac97</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382"> +- <driver>es1391</driver> +- </device> +- </devices> +-</os> +- +-<os id="http://software.opensuse.org/112"> +- <short-id>opensuse11.2</short-id> +- <name>OpenSuse 11.2</name> +- <version>11.2</version> +- <vendor>OpenSuse Project</vendor> ++<os id="https://wiki.parabola.nu/Get_Parabola"> ++ <short-id>parabola</short-id> ++ <name>Parabola GNU/Linux-libre</name> ++ <vendor>Parabola Project</vendor> + </os> + +-<deployment id="http://fedoraproject.org/fedora-10?kvm-0.11.0"> +- <platform id="http://qemu.org/qemu-kvm-0.11.0" /> +- <os id="http://fedoraproject.org/fedora-10" /> +- +- <devices> +- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382"> +- <driver>ac97</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000"> +- <driver>ES1370</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/a727/0013"> +- <driver>3com</driver> +- </device> +- </devices> +-</deployment> +- +-<deployment id="http://fedoraproject.org/fedora-11?kvm-0.11.0"> +- <platform id="http://qemu.org/qemu-kvm-0.11.0" /> +- <os id="http://fedoraproject.org/fedora-11" /> +- +- <devices> +- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000"> +- <driver>es1370</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382"> +- <driver>ac97</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/1274/1371/80864541"> +- <driver>es1371</driver> +- </device> +- <device id="http://pci-ids.ucw.cz/read/PC/a727/0013"> +- <driver>3com</driver> +- </device> +- </devices> +-</deployment> +- + <!-- End of backing data --> + </libosinfo> +diff -Nur libosinfo-0.3.0.orig/po/POTFILES.in libosinfo-0.3.0/po/POTFILES.in +--- libosinfo-0.3.0.orig/po/POTFILES.in 2016-01-07 14:38:22.000000000 -0300 ++++ libosinfo-0.3.0/po/POTFILES.in 2016-02-01 03:43:05.233662949 -0300 +@@ -1,340 +1,3 @@ +-data/os/altlinux.org/altlinux-1.0.xml.in +-data/os/altlinux.org/altlinux-2.0.xml.in +-data/os/altlinux.org/altlinux-2.2.xml.in +-data/os/altlinux.org/altlinux-2.4.xml.in +-data/os/altlinux.org/altlinux-3.0.xml.in +-data/os/altlinux.org/altlinux-4.0.xml.in +-data/os/altlinux.org/altlinux-4.1.xml.in +-data/os/altlinux.org/altlinux-5.0.xml.in +-data/os/altlinux.org/altlinux-6.0.xml.in +-data/os/altlinux.org/altlinux-7.0.xml.in +-data/os/apple.com/macosx-10.0.xml.in +-data/os/apple.com/macosx-10.1.xml.in +-data/os/apple.com/macosx-10.2.xml.in +-data/os/apple.com/macosx-10.3.xml.in +-data/os/apple.com/macosx-10.4.xml.in +-data/os/apple.com/macosx-10.5.xml.in +-data/os/apple.com/macosx-10.6.xml.in +-data/os/apple.com/macosx-10.7.xml.in +-data/os/centos.org/centos-6.0.xml.in +-data/os/centos.org/centos-6.1.xml.in +-data/os/centos.org/centos-6.2.xml.in +-data/os/centos.org/centos-6.3.xml.in +-data/os/centos.org/centos-6.4.xml.in +-data/os/centos.org/centos-6.5.xml.in +-data/os/centos.org/centos-6.6.xml.in +-data/os/centos.org/centos-6.7.xml.in +-data/os/centos.org/centos-7.0.xml.in +-data/os/debian.org/debian-1.1.xml.in +-data/os/debian.org/debian-1.2.xml.in +-data/os/debian.org/debian-1.3.xml.in +-data/os/debian.org/debian-2.0.xml.in +-data/os/debian.org/debian-2.1.xml.in +-data/os/debian.org/debian-2.2.xml.in +-data/os/debian.org/debian-3.1.xml.in +-data/os/debian.org/debian-3.xml.in +-data/os/debian.org/debian-4.xml.in +-data/os/debian.org/debian-5.xml.in +-data/os/debian.org/debian-6.xml.in +-data/os/debian.org/debian-7.xml.in +-data/os/debian.org/debian-8.xml.in +-data/os/fedoraproject.org/fedora-1.xml.in +-data/os/fedoraproject.org/fedora-2.xml.in +-data/os/fedoraproject.org/fedora-3.xml.in +-data/os/fedoraproject.org/fedora-4.xml.in +-data/os/fedoraproject.org/fedora-5.xml.in +-data/os/fedoraproject.org/fedora-6.xml.in +-data/os/fedoraproject.org/fedora-7.xml.in +-data/os/fedoraproject.org/fedora-8.xml.in +-data/os/fedoraproject.org/fedora-9.xml.in +-data/os/fedoraproject.org/fedora-10.xml.in +-data/os/fedoraproject.org/fedora-11.xml.in +-data/os/fedoraproject.org/fedora-12.xml.in +-data/os/fedoraproject.org/fedora-13.xml.in +-data/os/fedoraproject.org/fedora-14.xml.in +-data/os/fedoraproject.org/fedora-15.xml.in +-data/os/fedoraproject.org/fedora-16.xml.in +-data/os/fedoraproject.org/fedora-17.xml.in +-data/os/fedoraproject.org/fedora-18.xml.in +-data/os/fedoraproject.org/fedora-19.xml.in +-data/os/fedoraproject.org/fedora-20.xml.in +-data/os/fedoraproject.org/fedora-21.xml.in +-data/os/fedoraproject.org/fedora-22.xml.in +-data/os/fedoraproject.org/fedora-23.xml.in +-data/os/fedoraproject.org/fedora-unknown.xml.in +-data/os/freebsd.org/freebsd-1.0.xml.in +-data/os/freebsd.org/freebsd-2.0.5.xml.in +-data/os/freebsd.org/freebsd-2.0.xml.in +-data/os/freebsd.org/freebsd-2.2.8.xml.in +-data/os/freebsd.org/freebsd-2.2.9.xml.in +-data/os/freebsd.org/freebsd-3.0.xml.in +-data/os/freebsd.org/freebsd-3.2.xml.in +-data/os/freebsd.org/freebsd-4.0.xml.in +-data/os/freebsd.org/freebsd-4.10.xml.in +-data/os/freebsd.org/freebsd-4.11.xml.in +-data/os/freebsd.org/freebsd-4.1.xml.in +-data/os/freebsd.org/freebsd-4.2.xml.in +-data/os/freebsd.org/freebsd-4.3.xml.in +-data/os/freebsd.org/freebsd-4.4.xml.in +-data/os/freebsd.org/freebsd-4.5.xml.in +-data/os/freebsd.org/freebsd-4.6.xml.in +-data/os/freebsd.org/freebsd-4.7.xml.in +-data/os/freebsd.org/freebsd-4.8.xml.in +-data/os/freebsd.org/freebsd-4.9.xml.in +-data/os/freebsd.org/freebsd-5.0.xml.in +-data/os/freebsd.org/freebsd-5.1.xml.in +-data/os/freebsd.org/freebsd-5.2.1.xml.in +-data/os/freebsd.org/freebsd-5.2.xml.in +-data/os/freebsd.org/freebsd-5.3.xml.in +-data/os/freebsd.org/freebsd-5.4.xml.in +-data/os/freebsd.org/freebsd-5.5.xml.in +-data/os/freebsd.org/freebsd-6.0.xml.in +-data/os/freebsd.org/freebsd-6.1.xml.in +-data/os/freebsd.org/freebsd-6.2.xml.in +-data/os/freebsd.org/freebsd-6.3.xml.in +-data/os/freebsd.org/freebsd-6.4.xml.in +-data/os/freebsd.org/freebsd-7.0.xml.in +-data/os/freebsd.org/freebsd-7.1.xml.in +-data/os/freebsd.org/freebsd-7.2.xml.in +-data/os/freebsd.org/freebsd-7.3.xml.in +-data/os/freebsd.org/freebsd-7.4.xml.in +-data/os/freebsd.org/freebsd-8.0.xml.in +-data/os/freebsd.org/freebsd-8.1.xml.in +-data/os/freebsd.org/freebsd-8.2.xml.in +-data/os/freebsd.org/freebsd-8.3.xml.in +-data/os/freebsd.org/freebsd-8.4.xml.in +-data/os/freebsd.org/freebsd-9.0.xml.in +-data/os/freebsd.org/freebsd-9.1.xml.in +-data/os/freebsd.org/freebsd-9.2.xml.in +-data/os/freebsd.org/freebsd-9.3.xml.in +-data/os/freebsd.org/freebsd-10.0.xml.in +-data/os/freebsd.org/freebsd-10.1.xml.in +-data/os/gnome.org/gnome-3.6.xml.in +-data/os/gnome.org/gnome-3.8.xml.in +-data/os/gnome.org/gnome-continuous-3.10.xml.in +-data/os/gnome.org/gnome-continuous-3.12.xml.in +-data/os/gnome.org/gnome-continuous-3.14.xml.in +-data/os/mageia.org/mageia-1.xml.in +-data/os/mageia.org/mageia-2.xml.in +-data/os/mageia.org/mageia-3.xml.in +-data/os/mandriva.com/mandrake-5.1.xml.in +-data/os/mandriva.com/mandrake-5.2.xml.in +-data/os/mandriva.com/mandrake-5.3.xml.in +-data/os/mandriva.com/mandrake-6.0.xml.in +-data/os/mandriva.com/mandrake-6.1.xml.in +-data/os/mandriva.com/mandrake-7.0.xml.in +-data/os/mandriva.com/mandrake-7.1.xml.in +-data/os/mandriva.com/mandrake-7.2.xml.in +-data/os/mandriva.com/mandrake-8.0.xml.in +-data/os/mandriva.com/mandrake-8.1.xml.in +-data/os/mandriva.com/mandrake-8.2.xml.in +-data/os/mandriva.com/mandrake-9.0.xml.in +-data/os/mandriva.com/mandrake-9.1.xml.in +-data/os/mandriva.com/mandrake-9.2.xml.in +-data/os/mandriva.com/mandrake-10.0.xml.in +-data/os/mandriva.com/mandrake-10.1.xml.in +-data/os/mandriva.com/mandrake-10.2.xml.in +-data/os/mandriva.com/mandriva-2006.0.xml.in +-data/os/mandriva.com/mandriva-2007.1.xml.in +-data/os/mandriva.com/mandriva-2007.xml.in +-data/os/mandriva.com/mandriva-2008.0.xml.in +-data/os/mandriva.com/mandriva-2008.1.xml.in +-data/os/mandriva.com/mandriva-2009.0.xml.in +-data/os/mandriva.com/mandriva-2009.1.xml.in +-data/os/mandriva.com/mandriva-2010.0.xml.in +-data/os/mandriva.com/mandriva-2010.1.xml.in +-data/os/mandriva.com/mandriva-2010.2.xml.in +-data/os/mandriva.com/mandriva-2011.xml.in +-data/os/mandriva.com/mbs-1.0.xml.in +-data/os/mandriva.com/mes-5.0.xml.in +-data/os/mandriva.com/mes-5.1.xml.in +-data/os/microsoft.com/msdos-6.22.xml.in +-data/os/microsoft.com/win-1.0.xml.in +-data/os/microsoft.com/win-10.xml.in +-data/os/microsoft.com/win-2.0.xml.in +-data/os/microsoft.com/win-2.1.xml.in +-data/os/microsoft.com/win-2k12r2.xml.in +-data/os/microsoft.com/win-2k12.xml.in +-data/os/microsoft.com/win-2k3r2.xml.in +-data/os/microsoft.com/win-2k3.xml.in +-data/os/microsoft.com/win-2k8r2.xml.in +-data/os/microsoft.com/win-2k8.xml.in +-data/os/microsoft.com/win-2k.xml.in +-data/os/microsoft.com/win-3.1.xml.in +-data/os/microsoft.com/win-7.xml.in +-data/os/microsoft.com/win-8.1.xml.in +-data/os/microsoft.com/win-8.xml.in +-data/os/microsoft.com/win-95.xml.in +-data/os/microsoft.com/win-98.xml.in +-data/os/microsoft.com/win-me.xml.in +-data/os/microsoft.com/winnt-3.1.xml.in +-data/os/microsoft.com/winnt-3.51.xml.in +-data/os/microsoft.com/winnt-3.5.xml.in +-data/os/microsoft.com/winnt-4.0.xml.in +-data/os/microsoft.com/win-vista.xml.in +-data/os/microsoft.com/win-xp.xml.in +-data/os/netbsd.org/netbsd-0.8.xml.in +-data/os/netbsd.org/netbsd-0.9.xml.in +-data/os/netbsd.org/netbsd-1.0.xml.in +-data/os/netbsd.org/netbsd-1.1.xml.in +-data/os/netbsd.org/netbsd-1.2.xml.in +-data/os/netbsd.org/netbsd-1.3.xml.in +-data/os/netbsd.org/netbsd-1.4.xml.in +-data/os/netbsd.org/netbsd-1.5.xml.in +-data/os/netbsd.org/netbsd-1.6.xml.in +-data/os/netbsd.org/netbsd-2.0.xml.in +-data/os/netbsd.org/netbsd-3.0.xml.in +-data/os/netbsd.org/netbsd-4.0.xml.in +-data/os/netbsd.org/netbsd-5.0.xml.in +-data/os/netbsd.org/netbsd-5.1.xml.in +-data/os/novell.com/netware-4.xml.in +-data/os/novell.com/netware-5.xml.in +-data/os/novell.com/netware-6.xml.in +-data/os/openbsd.org/openbsd-4.2.xml.in +-data/os/openbsd.org/openbsd-4.3.xml.in +-data/os/openbsd.org/openbsd-4.4.xml.in +-data/os/openbsd.org/openbsd-4.5.xml.in +-data/os/openbsd.org/openbsd-4.8.xml.in +-data/os/openbsd.org/openbsd-4.9.xml.in +-data/os/openbsd.org/openbsd-5.0.xml.in +-data/os/openbsd.org/openbsd-5.1.xml.in +-data/os/openbsd.org/openbsd-5.2.xml.in +-data/os/openbsd.org/openbsd-5.3.xml.in +-data/os/openbsd.org/openbsd-5.4.xml.in +-data/os/openbsd.org/openbsd-5.5.xml.in +-data/os/openbsd.org/openbsd-5.6.xml.in +-data/os/openbsd.org/openbsd-5.7.xml.in +-data/os/openbsd.org/openbsd-5.8.xml.in +-data/os/opensuse.org/opensuse-10.2.xml.in +-data/os/opensuse.org/opensuse-10.3.xml.in +-data/os/opensuse.org/opensuse-11.0.xml.in +-data/os/opensuse.org/opensuse-11.1.xml.in +-data/os/opensuse.org/opensuse-11.2.xml.in +-data/os/opensuse.org/opensuse-11.3.xml.in +-data/os/opensuse.org/opensuse-11.4.xml.in +-data/os/opensuse.org/opensuse-12.1.xml.in +-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-factory.xml.in +-data/os/opensuse.org/opensuse-unknown.xml.in +-data/os/oracle.com/solaris-11.xml.in +-data/os/redhat.com/rhel-2.1.1.xml.in +-data/os/redhat.com/rhel-2.1.2.xml.in +-data/os/redhat.com/rhel-2.1.3.xml.in +-data/os/redhat.com/rhel-2.1.4.xml.in +-data/os/redhat.com/rhel-2.1.5.xml.in +-data/os/redhat.com/rhel-2.1.6.xml.in +-data/os/redhat.com/rhel-2.1.7.xml.in +-data/os/redhat.com/rhel-2.1.xml.in +-data/os/redhat.com/rhel-3.1.xml.in +-data/os/redhat.com/rhel-3.2.xml.in +-data/os/redhat.com/rhel-3.3.xml.in +-data/os/redhat.com/rhel-3.4.xml.in +-data/os/redhat.com/rhel-3.5.xml.in +-data/os/redhat.com/rhel-3.6.xml.in +-data/os/redhat.com/rhel-3.7.xml.in +-data/os/redhat.com/rhel-3.8.xml.in +-data/os/redhat.com/rhel-3.9.xml.in +-data/os/redhat.com/rhel-3.xml.in +-data/os/redhat.com/rhel-4.0.xml.in +-data/os/redhat.com/rhel-4.1.xml.in +-data/os/redhat.com/rhel-4.2.xml.in +-data/os/redhat.com/rhel-4.3.xml.in +-data/os/redhat.com/rhel-4.4.xml.in +-data/os/redhat.com/rhel-4.5.xml.in +-data/os/redhat.com/rhel-4.6.xml.in +-data/os/redhat.com/rhel-4.7.xml.in +-data/os/redhat.com/rhel-4.8.xml.in +-data/os/redhat.com/rhel-4.9.xml.in +-data/os/redhat.com/rhel-5.0.xml.in +-data/os/redhat.com/rhel-5.10.xml.in +-data/os/redhat.com/rhel-5.11.xml.in +-data/os/redhat.com/rhel-5.1.xml.in +-data/os/redhat.com/rhel-5.2.xml.in +-data/os/redhat.com/rhel-5.3.xml.in +-data/os/redhat.com/rhel-5.4.xml.in +-data/os/redhat.com/rhel-5.5.xml.in +-data/os/redhat.com/rhel-5.6.xml.in +-data/os/redhat.com/rhel-5.7.xml.in +-data/os/redhat.com/rhel-5.8.xml.in +-data/os/redhat.com/rhel-5.9.xml.in +-data/os/redhat.com/rhel-6.0.xml.in +-data/os/redhat.com/rhel-6.1.xml.in +-data/os/redhat.com/rhel-6.2.xml.in +-data/os/redhat.com/rhel-6.3.xml.in +-data/os/redhat.com/rhel-6.4.xml.in +-data/os/redhat.com/rhel-6.5.xml.in +-data/os/redhat.com/rhel-6.6.xml.in +-data/os/redhat.com/rhel-6.7.xml.in +-data/os/redhat.com/rhel-7.0.xml.in +-data/os/redhat.com/rhel-7.1.xml.in +-data/os/redhat.com/rhel-7.2.xml.in +-data/os/redhat.com/rhel-atomic-7.0.xml.in +-data/os/redhat.com/rhel-atomic-7.1.xml.in +-data/os/redhat.com/rhl-1.0.xml.in +-data/os/redhat.com/rhl-1.1.xml.in +-data/os/redhat.com/rhl-2.0.xml.in +-data/os/redhat.com/rhl-2.1.xml.in +-data/os/redhat.com/rhl-3.0.3.xml.in +-data/os/redhat.com/rhl-4.0.xml.in +-data/os/redhat.com/rhl-4.1.xml.in +-data/os/redhat.com/rhl-4.2.xml.in +-data/os/redhat.com/rhl-5.0.xml.in +-data/os/redhat.com/rhl-5.1.xml.in +-data/os/redhat.com/rhl-5.2.xml.in +-data/os/redhat.com/rhl-6.0.xml.in +-data/os/redhat.com/rhl-6.1.xml.in +-data/os/redhat.com/rhl-6.2.xml.in +-data/os/redhat.com/rhl-7.1.xml.in +-data/os/redhat.com/rhl-7.2.xml.in +-data/os/redhat.com/rhl-7.3.xml.in +-data/os/redhat.com/rhl-7.xml.in +-data/os/redhat.com/rhl-8.0.xml.in +-data/os/redhat.com/rhl-9.xml.in +-data/os/sun.com/opensolaris-2009.06.xml.in +-data/os/sun.com/solaris-9.xml.in +-data/os/sun.com/solaris-10.xml.in +-data/os/suse.com/sled-9.xml.in +-data/os/suse.com/sled-10.xml.in +-data/os/suse.com/sled-11.1.xml.in +-data/os/suse.com/sled-11.2.xml.in +-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/sles-9.xml.in +-data/os/suse.com/sles-10.xml.in +-data/os/suse.com/sles-11.1.xml.in +-data/os/suse.com/sles-11.2.xml.in +-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/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 +-data/os/ubuntu.com/ubuntu-6.06.xml.in +-data/os/ubuntu.com/ubuntu-6.10.xml.in +-data/os/ubuntu.com/ubuntu-7.04.xml.in +-data/os/ubuntu.com/ubuntu-7.10.xml.in +-data/os/ubuntu.com/ubuntu-8.04.xml.in +-data/os/ubuntu.com/ubuntu-8.10.xml.in +-data/os/ubuntu.com/ubuntu-9.04.xml.in +-data/os/ubuntu.com/ubuntu-9.10.xml.in +-data/os/ubuntu.com/ubuntu-10.04.xml.in +-data/os/ubuntu.com/ubuntu-10.10.xml.in +-data/os/ubuntu.com/ubuntu-11.04.xml.in +-data/os/ubuntu.com/ubuntu-11.10.xml.in +-data/os/ubuntu.com/ubuntu-12.04.xml.in +-data/os/ubuntu.com/ubuntu-12.10.xml.in +-data/os/ubuntu.com/ubuntu-13.04.xml.in +-data/os/ubuntu.com/ubuntu-13.10.xml.in +-data/os/ubuntu.com/ubuntu-14.04.xml.in +-data/os/ubuntu.com/ubuntu-14.10.xml.in +-data/os/ubuntu.com/ubuntu-15.04.xml.in +-data/os/ubuntu.com/ubuntu-15.10.xml.in + data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in + data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in + data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in +@@ -375,14 +38,6 @@ + data/platform/qemu.org/qemu-2.2.0.xml.in + data/platform/qemu.org/qemu-2.2.1.xml.in + data/platform/qemu.org/qemu-2.3.0.xml.in +-data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in +-data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in + data/platform/xen.org/xen-3.0.2.xml.in + data/platform/xen.org/xen-3.0.3.xml.in + data/platform/xen.org/xen-3.0.4.xml.in +diff -Nur libosinfo-0.3.0.orig/po/POTFILES.skip libosinfo-0.3.0/po/POTFILES.skip +--- libosinfo-0.3.0.orig/po/POTFILES.skip 1969-12-31 21:00:00.000000000 -0300 ++++ libosinfo-0.3.0/po/POTFILES.skip 2016-02-01 09:43:16.124756649 -0300 +@@ -0,0 +1,8 @@ ++data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in ++data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in +diff -Nur libosinfo-0.3.0.orig/test/test-isodetect.c libosinfo-0.3.0/test/test-isodetect.c +--- libosinfo-0.3.0.orig/test/test-isodetect.c 2015-11-23 12:53:52.000000000 -0300 ++++ libosinfo-0.3.0/test/test-isodetect.c 2016-02-01 03:46:28.596948365 -0300 +@@ -366,90 +366,6 @@ g_object_unref(loader); } @@ -213,6 +709,12 @@ diff -Nur libosinfo-0.2.12.orig/test/test-isodetect.c libosinfo-0.2.12/test/test -} -END_TEST - +-START_TEST(test_freebsd) +-{ +- test_one("freebsd"); +-} +-END_TEST +- -START_TEST(test_openbsd) -{ - test_one("openbsd"); @@ -264,7 +766,7 @@ diff -Nur libosinfo-0.2.12.orig/test/test-isodetect.c libosinfo-0.2.12/test/test static Suite * list_suite(void) { -@@ -437,19 +359,6 @@ +@@ -457,20 +373,6 @@ TCase *tc = tcase_create("Core"); tcase_set_timeout(tc, 20); @@ -273,6 +775,7 @@ diff -Nur libosinfo-0.2.12.orig/test/test-isodetect.c libosinfo-0.2.12/test/test - tcase_add_test(tc, test_ubuntu); - tcase_add_test(tc, test_debian); - tcase_add_test(tc, test_windows); +- tcase_add_test(tc, test_freebsd); - tcase_add_test(tc, test_openbsd); - tcase_add_test(tc, test_opensuse); - tcase_add_test(tc, test_centos); @@ -284,3 +787,15 @@ diff -Nur libosinfo-0.2.12.orig/test/test-isodetect.c libosinfo-0.2.12/test/test suite_add_tcase(s, tc); return s; } +diff -Nur libosinfo-0.3.0.orig/test/test-xml-validate libosinfo-0.3.0/test/test-xml-validate +--- libosinfo-0.3.0.orig/test/test-xml-validate 2015-11-23 12:53:52.000000000 -0300 ++++ libosinfo-0.3.0/test/test-xml-validate 2016-02-01 09:33:49.543704489 -0300 +@@ -42,7 +42,7 @@ + : ${srcdir=.} + . $srcdir/test-lib.sh + +-DIRS="datamap os platform device install-script" ++DIRS="datamap platform device" + SCHEMA="libosinfo.rng" + + check_schema "$DIRS" "$SCHEMA" |