The initial repository state was created from libosinfo
GIT at revision:
commit 501541a336cd29d3da48584f022ce329fef418dd
Author: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
Date: Thu May 12 18:54:58 2016 +0200
win,installer: Fix "Windwos" typo
It was initialized using the following commands:
$ git clone libosinfo osinfo-db-tools
$ cd osinfo-db-tools
$ git filter-branch --index-filter 'git rm -r --cached \
--ignore-unmatch src examples data db test \
docs/reference tools/osinfo-detect.c \
tools/osinfo-install-script.c \
tools/osinfo-query.c po osinfo' HEAD
$ git filter-branch -f --prune-empty HEAD
$ git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d
$ git reflog expire --expire=now --all
$ git gc --prune=now
This patch now edits the various build system files to
remove references to bits of the tree that were deleted,
and rename from libosinfo to osinfo-db-tools.
Currently this module contains a single command
osinfo-db-validate
It will later be augmented with tools for importing
and exporting database archives.
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
.gitignore | 51 +----
AUTHORS.in | 8 +-
Makefile.am | 27 +--
NEWS | 496 +-----------------------------------------
README | 23 +-
autobuild.sh | 4 +-
autogen.sh | 4 +-
cfg.mk | 11 -
configure.ac | 265 +---------------------
docs/Makefile.am | 2 +-
docs/object-model.fig | 113 ----------
libosinfo.spec.in | 144 ------------
mingw-libosinfo.spec.in | 141 ------------
mingw-osinfo-db-tools.spec.in | 85 ++++++++
osinfo-db-tools.spec.in | 39 ++++
po/LINGUAS | 95 ++++++++
po/POTFILES.in | 1 +
po/zanata.xml | 106 +++++++++
tools/Makefile.am | 27 +--
19 files changed, 355 insertions(+), 1287 deletions(-)
delete mode 100644 docs/object-model.fig
delete mode 100644 libosinfo.spec.in
delete mode 100644 mingw-libosinfo.spec.in
create mode 100644 mingw-osinfo-db-tools.spec.in
create mode 100644 osinfo-db-tools.spec.in
create mode 100644 po/LINGUAS
create mode 100644 po/POTFILES.in
create mode 100644 po/zanata.xml
diff --git a/.gitignore b/.gitignore
index 1cc9e2f..03c5264 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,64 +32,15 @@ intltool-update.in
libtool
m4
stamp-h1
-test/test-skeleton
-test/test-skeleton.sh
-osinfo/libosinfo.pc
-osinfo/Libosinfo-1.0.gir
-osinfo/Libosinfo-1.0.typelib
-osinfo/libosinfo-1.0.vapi
-osinfo/osinfo_enum_types.[ch]
-osinfo/osinfo_version.h
-*.gcno
-*.gcda
-coverage/
*.spec
-*.pc
-test/test-device
-test/test-os
-test/test-entity
-test/test-hypervisor
-test/test-list
-test/test-db
-test/test-devicelist
-test/test-filter
-test/test-hypervisorlist
-test/test-install-script
-test/test-loader
-test/test-productfilter
-test/test-oslist
-test/test-product
-test/test-platform
-test/test-platformlist
-test/test-isodetect
-test/test-mediauris
-test/test-treeuris
-test/*.log
-test/*.trs
build/
-gtk-doc.make
-data/95-osinfo.rules
-data/*/*/*.xml
-data/*/*/*/*.xml
-data/pci.ids
-data/usb.ids
-tools/osinfo-detect
-tools/osinfo-detect.1
-tools/osinfo-detect.exe
tools/osinfo-db-validate
tools/osinfo-db-validate.exe
tools/osinfo-db-validate.1
-tools/osinfo-query
-tools/osinfo-query.1
-tools/osinfo-query.exe
-tools/osinfo-install-script
-tools/osinfo-install-script.exe
-tools/osinfo-install-script.1
-docs/reference/Libosinfo.types
po/.intltool-merge-cache
po/Makefile.in.in
po/POTFILES
-po/libosinfo.pot
+po/osinfo-db-tools.pot
po/stamp-it
po/Makevars.template
po/Rules-quot
diff --git a/AUTHORS.in b/AUTHORS.in
index 1f7ca5c..397100c 100644
--- a/AUTHORS.in
+++ b/AUTHORS.in
@@ -1,15 +1,11 @@
- libosinfo Authors
- =================
+ osinfo-db-tools Authors
+ =======================
Current maintainers:
Zeeshan Ali (Khattak) <zeeshanak@xxxxxxxxx>
Daniel P. Berrange <berrange@xxxxxxxxxx>
-Previous maintainers:
-
- Arjun Roy <arroy@xxxxxxxxxx>
-
Patches contributed by:
#authorslist#
diff --git a/Makefile.am b/Makefile.am
index 32db4c3..de95eef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = osinfo data test tools docs po examples
+SUBDIRS = tools docs po
INTLTOOL_FILES = \
intltool-extract.in \
@@ -16,9 +16,9 @@ DISTCLEANFILES = \
EXTRA_DIST = \
COPYING.LIB \
- libosinfo.spec \
- libosinfo.spec.in \
- mingw-libosinfo.spec.in \
+ osinfo-db-tools.spec \
+ osinfo-db-tools.spec.in \
+ mingw-osinfo-db-tools.spec.in \
build-aux/mktempd \
cfg.mk \
GNUmakefile \
@@ -39,27 +39,8 @@ MAINTAINERCLEANFILES = \
po/remove-potcdate.sin \
$(NULL)
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
-
ACLOCAL_AMFLAGS = -I m4
-LCOV = lcov
-GENHTML = genhtml
-
-cov: clean-cov
- mkdir $(top_builddir)/coverage
- $(LCOV) -c -o $(top_builddir)/coverage/libosinfo.info.tmp \
- -d $(top_builddir)/osinfo
- $(LCOV) -r $(top_builddir)/coverage/libosinfo.info.tmp \
- -o $(top_builddir)/coverage/libosinfo.info
- rm $(top_builddir)/coverage/libosinfo.info.tmp
- $(GENHTML) --show-details -t "libosinfo" -o $(top_builddir)/coverage \
- --legend $(top_builddir)/coverage/libosinfo.info
-
-
-clean-cov:
- rm -rf $(top_builddir)/coverage
-
dist-hook: gen-ChangeLog gen-AUTHORS
# Generate the ChangeLog file (with all entries since the switch to git)
diff --git a/NEWS b/NEWS
index 242de15..e50163a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,496 +1,4 @@
-0.3.0 - Jan 08, 2016
-====================
-
-Changes since 0.2.12:
-
-- Ditch custom udev rule since udev/blkid already expose ISO9660 properties.
-- New layout for database to facilitate local admin customization. Refer to
- docs/database-layout.txt for full details.
-- Many build-related fixes.
-- Plug many memory leaks.
-- Drop redundant information on PCI devices.
-- Fix the URI format for install scripts.
-- Memory corruption fixes.
-- Massive refactoring/cleanup of database.
-- Fixes to tests.
-- osinfo_loader_process_*() now expect a directory argument. Regular files are
- still supported but this support is deprecated.
-- Ensure Linux install scripts install qemu-guest-agent. This allows
- applications to do things like resyncing the clock of guest with that of host.
-- Add/improve/fix data on:
- - Alt Linux
- - CentOS
- - Debian
- - Fedora
- - FreeBSD
- - GNOME
- - KVM
- - Microsoft Windows 7, 8, 10 and Server 2012
- - Novell Netware
- - OpenBSD
- - openSUSE
- - PCI and PS/2 devices
- - Qemu
- - Red Hat Enterprise Linux
- - Red Hat Linux
- - Solaris
- - Ubuntu
- - Xen
-- Many internal cleanups.
-
-Dependencies changed:
-
-Require libsoup >= 2.42
-
-0.2.12 - May 27, 2015
-=====================
-
-Changes since 0.2.11:
-
-- Add API to get/set ISO9660 volume size of media.
-- Make use of volume size of ISO files for detection. This enables us to
- differentiate between DVD and netiso of Fedora, for example.
-- Allow install trees to be associated with specific variants of the OS.
-- Use direct HTTPS URLs to drivers.
-- Install scripts
- * Add API to generate script against a particular media.
- * Fix Fedora script to work with netiso.
- * Bigger /boot partition for Fedora and RHEL.
- * Don't specify network interface for Fedora and RHEL.
-- Add/improve/fix data on:
- - Debian 8.0
- - Fedora (all versions)
- - GNOME 3.14
- - Microsoft Windows Vista, 7 and 8.1.
- - OpenBSD 5.6
- - openSUSE
- - RHEL 5.9-11, 6.6 and Atomic 7.0.
- - SUSE
- - Ubuntu 14.04 and 15.04.
-- Fix some leaks.
-- Fix and add some API documentation.
-- Many build fixes.
-
-0.2.11 - Aug 19, 2014
-=====================
-
-Changes since 0.2.10:
-
-- Document hostname limitations.
-- Export OSINFO_*_VERSION macros.
-- Add desktop scripts for Debian.
-- Add API to query install scripts if they require an internet connection.
-- Some fixes to Debian JEOS script.
-- Add/improve/fix data on:
- - CentOS
- - Debian
- - FreeBSD
- - Microsoft Windows 7
- - Microsoft Windows 8
- - Microsoft Windows Server 2012
- - Microsoft Vista
- - OpenBSD
- - OpenSUSE
- - Red Hat Enterprise Linux 7
-- More ISO detection testcases.
-- Many performance improvements.
-- Fixes to documentation.
-- Fixes to build.
-
-0.2.10 - Mar 20, 2014
-=====================
-
-Changes since 0.2.9:
-
-- Add API and option to osinfo-install-script utility that allows you to query
- the available methods to inject the installer script to the installation
- process.
-- Add JEOS installer scripts for Debian and Ubuntu.
-- Disable installer script for Windows 8.1 as its known not to work.
-- Allow XML special chars in installer script configuration values.
-- Fix a few build issues.
-- Add/improve/fix data on:
- - Debian
- - Fedora
- - FreeBSD
- - Mandrake
- - Mandriva
- - Microsoft Windows 7
- - openSUSE
- - Solaris
- - Ubuntu
- - Qemu
-
-0.2.9 - Dec 16, 2013
-====================
-
-Changes since 0.2.8:
-
-- Add/improve/fix data on:
- - Debian
- - Fedora 20
- - GNOME continuous 3.12
- - Mageia
- - Microsoft Windows 7
- - Microsoft Windows 8.1
- - RHEL 5.8
- - RHEL 6.5
- - RHEL 7.0
-- Support '<foo/>' syntax for booleans in database, in addition to existing
- '<foo>true</foo>'.
-- New API/XML to determine/specify:
- - if an OS is an actual release, a pre-release or a development snapshot.
- - variants of an OS. For example, professional, enterprise and ultimate
- editions of Windows OSs and workstation and server variants of RHEL etc.
-- Various fixes to build system.
-- More testcases.
-- Some other minor fixes/changes.
-
-0.2.8 - Sep 16, 2013
-====================
-
-Changes since 0.2.7:
-- Add/improve/fix data on:
- - ALTLinux
- - Fedora 19
- - Fedora 20
- - FreeBSD
- - GNOME 3.8
- - GNOME 3.10
- - Microsoft Windows 7
- - QEMU
- - Ubuntu
-- Add testcases for media detection:
- - Microsoft Windows Server 2008 R2
-- Fix export of public API.
-- Hide private API.
-- Fix a parallel build issue.
-- Fix build against latest intltool.
-- Drop usage of deprecated API.
-
-0.2.7 - May 13, 2013
-====================
-
-Changes since 0.2.6:
-
-- Add/improve/fix data on:
- - CentOS 6.*
- - Fedora 19
- - GNOME 3.8
- - openSUSE 12.3
- - RHEL 6.4
- - Ubuntu 13.04
-- Add testcases for media detection:
- - Debian 7.0.*
- - Fedora 17, 18 and 19
- - Ubuntu 12.10 and 13.04
-- Installer script fixes/improvements:
- - Setup user avatar for Windows 7.
- - Fix against old RHEL and Fedora.
- - Specify installation method for Fedora (required by Fedora 19).
-- New API:
- - osinfo_platform_get_all_devices()
- - osinfo_install_script_generate_command_line()
-- build:
- - Take DESTDIR into account when creating symlinks.
- - Fix issues with installing in a tree where libosinfo was already installed.
- - Fix a race-condition regarding usb.ids/pci.ids setup.
- - Disable static libraries by default.
-- Some portability improments/fixes.
-- Fixes `make syntax-check`.
-- More docs and fixes to existing docs.
-
-0.2.6 - March 18, 2013
-======================
-
-Changes since 0.2.5:
-
-- New API to:
- - query signed status of device drivers.
- - query device driver signing requirement of installer scripts.
- - enable/disable installer script driver signing checks.
-- Use system-installed pci.ids/usb.ids files, if available.
-- Don't ignore vendor/device names from pci.ids/usb.ids files.
-- Corrections to RPM spec.
-
-0.2.5 - March 04, 2013
-======================
-
-Changes since 0.2.4:
-
-- Make use of post-installation drivers in Windows 7 install scripts. This
- implies apps can now easily setup virtio+QXL device drivers and spice-vdagent
- as part of Windows 7 unattended installation.
-- Windows 7 install script now requires product key, mainly because product key
- is the only way to choose product when dealing with installer media with
- multiple products on it.
-- Actually add install scripts for Windows 8. This was supposed to be merged in
- release 0.2.3.
-- Formalize architecture names in DB to align with libvirt. The main change is
- that i386, i486, i586, all merge to just i686, since in practice these
- differences haven't mattered for at least 15 years now.
-- Fixes to mingw RPM spec from Fedora.
-- Add a Windows 7 volume ID to DB.
-
-0.2.4 - Feb 19, 2013
-====================
-
-Changes since 0.2.3:
-
-- Fix crash in osinfo-detect against non-bootable media.
-- osinfo-install-script now displays names of generated files.
-- Add an all-in-one virtio and QXL device driver setup binary to Windows XP
- and 7. Same binary also installs spice-vdagent for us.
-- Make use of post-installation drivers in Windows XP installer scripts.
-- Log post-install commands of Windows XP to target disk.
-- Add/improve/fix data on:
- - QEMU/QEMU-KVM hypervisor
- - GNOME
- - openSUSE
-- RPM spec file changes:
- - Include datamaps and locale files.
- - Pointto libosinfo official website.
- - Disable udev rule on Fedora >= 19. Changes in udev > 197 and
- libblkid > 2.22.2 have made this rule obsolete.
-- Adapt to glib 2.36.
-- Fix some build warnings.
-- Some other fixes and improvements.
-
-0.2.3 - Jan 14, 2013
-====================
-
-Changes since 0.2.2:
-
-- Add datamaps for translating OS-neutral values to OS-specific ones, e.g some
- installer configuration parameters like keyboard, language and timezone etc.
-- New API to detect media that makes it possible to also query languages
- supported by the media.
-- Add install scripts for:
- - RHEL 6.x.
- - Microsoft Windows 8
-- Fix install script for Fedora 18.
-- Drop support for encoding in l10n install script configuration parameters.
-- Fix test build issues.
-- Fixes and improvements to documentation.
-- Fix potential issues spotted by Coverity.
-- Fix build for translations.
-- osinfo-install-script tool now has options to list available configuration
- parameters and profiles.
-- Add/improve data on:
- - RHEL
- - Debian
- - openSUSE
- - Microsoft Windows 7
- - Ubuntu
- - MacOS X
-- Added translations:
- - Ukrainian
- - Polish
-- Many other fixes and improvements.
-
-0.2.2 - Dec 10, 2012
-====================
-
-Changes since 0.2.1:
-
-- Loads of improvements and fixes to installer APIs and scripts. Now they are in
- such a good shape that next release of Boxes will make full use of them.
-- Add API for information on downloadable device drivers. As a starting point,
- information on virtio storage drivers for Windows XP and 7 is provided.
-- Add/improve data on:
- - RHEL
- - Windows 7
- - Windows 8
- - Windows XP
-- Enable translations for many (potential) user-visible strings. No
- translations submitted yet. :(
-- Correct default value for OsinfoMedia::installer-reboots.
-- Register enum types with gobject type system.
-- Add enum param getter/setter helpers.
-- OsinfoList is now instantiable and all its subclasses has been deprecated.
- Newer code should use OsinfoList directly.
-- Various other fixes and improvements.
-
-0.2.1 - Oct 12, 2012
-====================
-
-Changes since 0.2.0:
-
-- Fix and simplify udev rule.
-- Fedora:
- - Fix minimum RAM requirements for F16 and F17.
-- Add data on:
- - Fedora 18
- - GNOME 3.6
- - Ubuntu 12.10
-- Fixes to doc build.
-- Install script:
- - Add get_config_param method.
- - Differenciate between expected/output script names.
- - Add more utility functions.
-- Add 'installer-reboots' parameter to medias.
-- osinfo-detect does not die of DB loading errors anymore.
-- More type-specific entity value getters/setters.
-- Fixe and update RNG file.
-- Add 'subsystem' property/attribute to devices.
-
-0.2.0 - Aug 31, 2012
-====================
-
-Introducing a new set of APIs to enable application developers to easily create
-unattended/automated installation scripts for various operating systems.
-Currently only Fedora and Microsoft Windows are supported. Also provided is a
-commandline tool, 'osinfo-install-script' to easily create such scripts without
-having to write any code.
-
-Other changes since 0.1.2:
-
-- Fix build against mingw64 toolchain.
-- API for getting product logo URLs.
-- Fix architecture for a Windows 2008 media.
-- Remove bogus minimum storage information for Fedora.
-- Add varirables for system and local database paths in pkg-config.
-
-0.1.2 - Jun 11, 2012
-====================
-
-Changes since 0.1.1:
-
-- Fix udev rules for CDROM media.
-- Fix build against newer glibc-headers when building with -O0.
-- More complete/up2date data for:
- - Fedora 17
- - Ubuntu
- - Windows
-- Fix data for:
- - Ubuntu
-- Correct order of elements returned by list union functions.
-
-0.1.1 - Apr 12, 2012
-====================
-
-Changes since 0.1.0:
-
-- Fixes to OS media detection.
-- Add support for more OSs:
- - NetBSD
- - Mandrake
-- More complete data for:
- - Debian
- - Fedora
- - RHEL
- - Ubuntu
- - Windows
- - OpenBSD
- - FreeBSD
- - Mandriva
-- Fix data for:
- - Fedora
- - openSUSE
- - Ubuntu
- - Windows
-- Add support for install tree metadata.
-- Add support for filtering products based on release/EOL dates.
-- Add support for product codenames.
-- Add support for 'distro'.
-- Also extract application ID from ISO9660 media.
-- Add test cases for validating ISO9660 data.
-- Disable obsolete media URLs.
-- Standardize OS family names as all lowercase.
-- Standardize format for OS id, short-id, distro, version.
-- Add RNG schema for database files.
-- Add a 'osinfo-db-validate' command for verifying database files.
-- Add a 'osinfo-query' command for searching/listing information from database.
-- Add a man page for the osinfo-detect command.
-- Add support for loading extra local database files. By default, libosinfo will
- expect them to be in /etc/libosinfo/db and $HOME/.local/config/libosinfo/db
- but new API is provided to change this behavior.
-- Fix generation of docs in a VPATH builder.
-- Fix loading of vendor and product names of USB and PCI devices.
-- Remove obsolete scripts for PCI/USB id conversion.
-- Remove redundant generic linux entries from database.
-- Fixes for 'make dist'.
-- Actually handle '--enable-vala' configure option and don't mandate vapigen if
- this option is not specified.
-- Add missing export of osinfo_entity_set_param.
-- Various other fixes and improvements.
-
-0.1.0 - Feb 7, 2012
-===================
-
-This release marks the start of the API/ABI stability promise. While some APIs
-may become deprecated in the future, no APIs will be removed/changed in an
-incompatible manner. In the unlikely event that an incompatible API change
-becomes necessary, the library soname will be incremented to allow parallel
-installation of both old & new libraries.
-
-Changes since 0.0.5:
-
-- Add Utility function to retrieve OS devices by property.
-- Improved OS media detection.
-- Add missing 'const' OsinfoList function params.
-- Use ENV{} in udev rule.
-
-0.0.5 - Jan 16, 2012
-====================
-
-Changes since 0.0.4:
-
-- Add QXL to supported devices of windows and Fedora.
-- Distribute and install forgotten device XML files.
-- Add all metadata from default path, not just OS.
-- List supported audio devices for Windows and Fedora.
-- Specify 'derives-from' relationship for Fedora OSs.
-- Add API to retreive all supported devices for an OS.
-- Fix some potential issues related to memory allocation/alignment.
-
-0.0.4 - Dec 19, 2011
-====================
-
-Changes since 0.0.3:
-
-- Fix silly mistakes in udev rules file.
-
-0.0.3 - Dec 16, 2011
-====================
-
-Changes since 0.0.2:
-
-- Add lots of more data on various different OSs out there. Now we also support
- some Apple OSs.
-- On successful OS detection, inform the application which known media of the OS
- the given media matched against. osinfo-detect tool and udev rule updated to
- make us of this.
-- Support applications' right to not be interested in error details.
-- Minor fixes/improvements to OS detection logic.
-- API to indicate media is live and/or installer.
-- Don't match non-live Fedora ISOs against live ones.
-- Fixes to Python demo to make it work.
-- Fix some potential crashes.
-- Fixes to RPM spec file.
-- Distribute RPM spec file.
-- Complement some getters with corresponding gobject properties.
-- Few other random minor fixes.
-
-WARNING: This release (slightly) breaks API with the last one.
-
-0.0.2 - Nov 22, 2011
-====================
-
-Changes since 0.0.1:
-
-- Improve media detection for Fedora, RHEL and Windows 7.
-- More complete documentation.
-- Fix configure script to not require 'check' when tests are disabled.
-- More automated documentation generation.
-- Add Fedora 16 metadata.
-- Recommend 9 GiB storage for Fedora 14-16.
-- Add openSUSE data.
-- Fix some copy&paste mistakes in OS database.
-- Add media information for 2011 Ubuntu releases and CentOS 6.0.
-- Improve README file.
-
-0.0.1
+1.0.0
=====
-First public release.
+- First public release after split from libosinfo
diff --git a/README b/README
index b2c54ae..75dfd20 100644
--- a/README
+++ b/README
@@ -1,15 +1,13 @@
-libosinfo
-=========
+osinfo-db-tools
+===============
-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 with demos for javascript (GJS/Seed) and python
-(PyGObject). Vala bindings are also provided.
+libosinfo is a project providing information about operating systems,
+hypervisors and the (virtual) hardware devices they can support.
-libosinfo is Free Software and licenced under LGPLv2+.
+This package contains a set of tools to assist administrators and
+developers in managing the database.
+
+osinfo-db-tools is Free Software and licenced under LGPLv2+.
The latest official releases can be found at:
@@ -21,14 +19,9 @@ Dependencies
- Required:
- gobject-2.0
- gio-2.0
- - libsoup-2.4
- libxml-2.0
- libxslt-1.0
-- Optional:
- - gobject-introspection
- - Vala (build-time only)
-
Patch submissions
=================
diff --git a/autobuild.sh b/autobuild.sh
index 1db1fce..0886329 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -54,7 +54,7 @@ if [ -f /usr/bin/rpmbuild ]; then
rpmbuild --nodeps \
--define "extra_release $EXTRA_RELEASE" \
--define "_sourcedir `pwd`" \
- -ba --clean libosinfo.spec
+ -ba --clean osinfo-db-tools.spec
fi
# Test mingw32 cross-compile
@@ -100,6 +100,6 @@ if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-
rpmbuild --nodeps \
--define "extra_release $EXTRA_RELEASE" \
--define "_sourcedir `pwd`" \
- -ba --clean mingw-libosinfo.spec
+ -ba --clean mingw-osinfo-db-tools.spec
fi
fi
diff --git a/autogen.sh b/autogen.sh
index eea755b..56bb280 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-(test -f $srcdir/osinfo/osinfo_db.c) || {
+(test -f $srcdir/tools/osinfo-db-validate.c) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level libosinfo directory"
exit 1
@@ -20,4 +20,4 @@ which gnome-autogen.sh || {
# exists at all times :-(
touch ChangeLog AUTHORS
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS" . gnome-autogen.sh --enable-gtk-doc "$@"
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS" . gnome-autogen.sh "$@"
diff --git a/cfg.mk b/cfg.mk
index 6725d29..c6d0e02 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -102,19 +102,8 @@ sc_bracket_spacing_check:
# We don't use this feature of maint.mk.
prev_version_file = /dev/null
-exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-gconfig/tests|examples)/
-
exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch]
exclude_file_name_regexp--sc_prohibit_strcmp = ^*/*.[ch]
-exclude_file_name_regexp--sc_require_config_h = python/libvirt-glib.c
-exclude_file_name_regexp--sc_require_config_h_first = python/libvirt-glib.c
-
-exclude_file_name_regexp--sc_trailing_blank = ^test/isodata/.*|docs/object-model.fig
-
exclude_file_name_regexp--sc_bindtextdomain = ^tools/.*.c|test/.*.c
-
-exclude_file_name_regexp--sc_space_tab = ^test/isodata/.*
-
-exclude_file_name_regexp--sc_prohibit_atoi_atof = ^test/.*\.c
diff --git a/configure.ac b/configure.ac
index e4850c7..28e0fc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-AC_INIT([libosinfo], [0.3.0], [libosinfo@xxxxxxxxxx])
+AC_INIT([osinfo-db-tools], [1.0.0], [libosinfo@xxxxxxxxxx])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11.1 foreign color-tests tar-ustar])
AC_PREREQ([2.61])
-AC_CONFIG_SRCDIR([osinfo/osinfo_db.c])
+AC_CONFIG_SRCDIR([tools/osinfo-db-validate.c])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
AC_PROG_LN_S
@@ -40,10 +40,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
GLIB_MINIMUM_VERSION="2.36"
GLIB_ENCODED_VERSION="GLIB_VERSION_2_36"
-# Keep these two definitions in agreement.
-SOUP_MINIMUM_VERSION="2.42"
-SOUP_ENCODED_VERSION="SOUP_VERSION_2_42"
-
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
@@ -53,265 +49,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_ENCODED_VERSION"
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
-PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= $SOUP_MINIMUM_VERSION])
-SOUP_CFLAGS="$SOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=$SOUP_ENCODED_VERSION"
-SOUP_CFLAGS="$SOUP_CFLAGS -DSOUP_VERSION_MAX_ALLOWED=$SOUP_ENCODED_VERSION"
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
-
-GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
-
-AC_ARG_ENABLE([tests],
- AS_HELP_STRING([--enable-tests], [enable test suite]),
- [], [enable_tests=yes])
-
-if test "x$enable_tests" != "xno" ; then
- PKG_CHECK_MODULES([CHECK], [check])
-fi
-
-LIBOSINFO_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
-LIBOSINFO_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'`
-LIBOSINFO_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'`
-LIBOSINFO_VERSION=$LIBOSINFO_MAJOR_VERSION.$LIBOSINFO_MINOR_VERSION.$LIBOSINFO_MICRO_VERSION$LIBOSINFO_MICRO_VERSION_SUFFIX
-LIBOSINFO_VERSION_INFO=`expr $LIBOSINFO_MAJOR_VERSION + $LIBOSINFO_MINOR_VERSION`:$LIBOSINFO_MICRO_VERSION:$LIBOSINFO_MINOR_VERSION
-LIBOSINFO_VERSION_NUMBER=`expr $LIBOSINFO_MAJOR_VERSION \* 1000000 + $LIBOSINFO_MINOR_VERSION \* 1000 + $LIBOSINFO_MICRO_VERSION`
-
-AC_SUBST([LIBOSINFO_MAJOR_VERSION])
-AC_SUBST([LIBOSINFO_MINOR_VERSION])
-AC_SUBST([LIBOSINFO_MICRO_VERSION])
-AC_SUBST([LIBOSINFO_VERSION])
-AC_SUBST([LIBOSINFO_VERSION_INFO])
-AC_SUBST([LIBOSINFO_VERSION_NUMBER])
-
-NO_UNDEFINED_LDFLAGS=
-VERSION_SCRIPT_FLAGS=
-USE_VERSION_DEFS=0
-case "$host" in
- *-*-mingw*)
- VERSION_SCRIPT_FLAGS="-Wl,"
- USE_VERSION_DEFS=1
- NO_UNDEFINED_FLAGS="-no-undefined"
- ;;
-
- *-*-cygwin*)
- NO_UNDEFINED_LDFLAGS="-no-undefined"
- ;;
-
- darwin*)
- NO_UNDEFINED_LDFLAGS="-Wl,-undefined,error"
- ;;
-
- *-*-solaris*)
- NO_UNDEFINED_LDFLAGS="-zdefs"
- ;;
-
- *)
- NO_UNDEFINED_FLAGS="-Wl,--no-undefined"
- VERSION_SCRIPT_FLAGS=-Wl,--version-script=
- `ld --help 2>&1 | grep -- --version-script >/dev/null` || \
- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- ;;
-esac
-AC_SUBST([NO_UNDEFINED_FLAGS])
-AC_SUBST([VERSION_SCRIPT_FLAGS])
-AM_CONDITIONAL([USE_VERSION_DEFS], [test "$USE_VERSION_DEFS" = "1"])
-
-with_linux=no
-case $host in
- *-*-linux*) with_linux=yes ;;
-esac
-AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
-
-
-GOBJECT_INTROSPECTION_CHECK([0.9.7])
-
-AC_ARG_ENABLE([vala],
- AS_HELP_STRING([--enable-vala], [enable Vala binding generation]),
- [], [enable_vala=check])
-if test "x$enable_introspection" = "xyes" ; then
- if test "x$enable_vala" != "xno" ; then
- AC_PATH_PROG(VAPIGEN, vapigen, no)
- if test "x$VAPIGEN" != "xno"; then
- if test "x$enable_vala" == "xcheck" ; then
- enable_vala=yes
- fi
- AC_SUBST(VAPIGEN)
- else
- if test "x$enable_vala" == "xyes" ; then
- AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH])
- fi
- fi
- fi
-fi
-AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"])
-
-AC_ARG_ENABLE([coverage],
- AS_HELP_STRING([--enable-coverage], [enable GCC code coverage]),
- [], [enable_coverage=no])
-
-
-COVERAGE_CFLAGS=
-COVERAGE_LDFLAGS=
-if test "x$enable_coverage" == "xyes" ; then
- COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
- COVERAGE_LDFLAGS="$COVERAGE_CFLAGS"
-fi
-AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_LDFLAGS)
-
-
-USB_ID_FILES="/usr/share/usb.ids /usr/share/misc/usb.ids /usr/share/hwdata/usb.ids"
-
-AC_ARG_WITH(usb-ids-path,
- [AC_HELP_STRING([--with-usb-ids-path],
- [Specify the path to usb.ids @<:@default=(internal)@:>@])])
-
-AC_MSG_CHECKING([location of usb.ids database])
-local_usb_ids=0
-if test -z "$with_usb_ids_path"
-then
- if test $host = $build
- then
- for FILE in $USB_ID_FILES
- do
- if test -f $FILE
- then
- with_usb_ids_path="$FILE"
- break
- fi
- done
- fi
-
- if test -z "$with_usb_ids_path"
- then
- local_usb_ids=1
- fi
-fi
-AM_CONDITIONAL([LOCAL_USB_IDS], [test "$local_usb_ids" = "1"])
-if test -n "$with_usb_ids_path"
-then
- AC_DEFINE_UNQUOTED([USB_IDS], ["$with_usb_ids_path"], ["location of usb.ids database"])
- AC_MSG_RESULT([$with_usb_ids_path])
-else
- AC_MSG_RESULT([<built-in>])
-fi
-
-
-PCI_ID_FILES="/usr/share/pci.ids /usr/share/misc/pci.ids /usr/share/hwdata/pci.ids"
-
-AC_ARG_WITH(pci-ids-path,
- [AC_HELP_STRING([--with-pci-ids-path],
- [Specify the path to pci.ids @<:@default=(internal)@:>@])])
-
-AC_MSG_CHECKING([location of pci.ids database])
-local_pci_ids=0
-if test -z "$with_pci_ids_path"
-then
- if test $host = $build
- then
- for FILE in $PCI_ID_FILES
- do
- if test -f $FILE
- then
- with_pci_ids_path="$FILE"
- break
- fi
- done
- fi
-
- if test -z "$with_pci_ids_path"
- then
- local_pci_ids=1
- fi
-fi
-AM_CONDITIONAL([LOCAL_PCI_IDS], [test "$local_pci_ids" = "1"])
-if test -n "$with_pci_ids_path"
-then
- AC_DEFINE_UNQUOTED([PCI_IDS], ["$with_pci_ids_path"], ["location of pci.ids database"])
- AC_MSG_RESULT([$with_pci_ids_path])
-else
- AC_MSG_RESULT([<built-in>])
-fi
-
-
-# Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-AC_SUBST(GLIB_MKENUMS)
-
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/opensuse.org/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
+ osinfo-db-tools.spec
+ mingw-osinfo-db-tools.spec
tools/Makefile
- test/Makefile
docs/Makefile
- docs/reference/Makefile
- examples/Makefile
po/Makefile.in
])
AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
index cac25f2..badb155 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = reference
+EXTRA_DIST = database-layout.txt data-sources.txt entity-id-scheme.txt
diff --git a/docs/object-model.fig b/docs/object-model.fig
deleted file mode 100644
index e73a104..0000000
--- a/docs/object-model.fig
+++ /dev/null
@@ -1,113 +0,0 @@
-#FIG 3.2 Produced by xfig version 3.2.5b
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-6 5700 900 7425 2700
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 5700 900 7425 900 7425 2700 5700 2700 5700 900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5700 1275 7425 1275
-4 0 0 50 -1 16 16 0.0000 4 195 825 5775 1200 Device\001
-4 0 0 50 -1 16 12 0.0000 4 150 510 5775 1500 Name\001
-4 0 0 50 -1 16 12 0.0000 4 150 615 5775 1740 Vendor\001
-4 0 0 50 -1 16 12 0.0000 4 150 675 5775 1980 Product\001
-4 0 0 50 -1 16 12 0.0000 4 150 495 5775 2220 Class\001
-4 0 0 50 -1 16 12 0.0000 4 150 345 5775 2460 Bus\001
--6
-6 5700 5025 7425 6825
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 5700 5025 7425 5025 7425 6825 5700 6825 5700 5025
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5700 5400 7425 5400
-4 0 0 50 -1 16 16 0.0000 4 195 930 5775 5325 Product\001
-4 0 0 50 -1 16 12 0.0000 4 150 510 5775 5625 Name\001
-4 0 0 50 -1 16 12 0.0000 4 150 615 5775 5865 Vendor\001
-4 0 0 50 -1 16 12 0.0000 4 150 660 5775 6105 Version\001
-4 0 0 50 -1 16 12 0.0000 4 150 720 5775 6345 Short ID\001
--6
-6 7950 7875 9675 9675
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 7950 7875 9675 7875 9675 9675 7950 9675 7950 7875
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7950 8250 9675 8250
-4 0 0 50 -1 16 16 0.0000 4 195 390 8025 8175 OS\001
--6
-6 10050 3825 11775 5625
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 10050 3825 11775 3825 11775 5625 10050 5625 10050 3825
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 10050 4200 11775 4200
-4 0 0 50 -1 16 16 0.0000 4 195 1320 10125 4125 DeviceLink\001
-4 0 0 50 -1 16 12 0.0000 4 150 510 10125 4425 Driver\001
--6
-6 1200 3300 2925 5100
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1200 3300 2925 3300 2925 5100 1200 5100 1200 3300
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 1200 3675 2925 3675
-4 0 0 50 -1 16 16 0.0000 4 195 375 1275 3600 DB\001
--6
-6 5850 10425 7575 12225
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 5850 10425 7575 10425 7575 12225 5850 12225 5850 10425
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5850 10800 7575 10800
-4 0 0 50 -1 16 16 0.0000 4 255 1440 5925 10725 Deployment\001
--6
-6 3600 7875 5325 9675
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3600 7875 5325 7875 5325 9675 3600 9675 3600 7875
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 3600 8250 5325 8250
-4 0 0 50 -1 16 16 0.0000 4 195 1005 3675 8175 Platform\001
--6
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 7425 1875 10875 1875 10875 3825
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
- 11250 5625 11250 12750 4275 12750 4275 9675
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 2925 4500 3975 4500 3975 7875
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 2925 4125 9300 4125 9300 7875
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 2925 3750 6525 3750 6525 2700
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 10875 5625 10875 11400 7575 11400
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 10500 5625 10500 8700 9675 8700
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 4950 9675 4950 11025 5850 11025
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 7575 11025 8325 11025 8325 9675
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6525 6825 6525 7275
-2 1 0 1 0 0 50 -1 20 0.000 0 0 7 0 0 4
- 6525 7125 6375 7275 6675 7275 6525 7125
-2 1 0 1 0 0 50 -1 -1 0.000 0 0 7 0 0 4
- 4275 7875 4275 7275 9000 7275 9000 7875
-2 1 0 1 0 0 50 -1 -1 0.000 0 0 7 0 0 5
- 6000 5025 6000 4650 5325 4650 5325 5325 5700 5325
-4 0 0 50 -1 16 12 0.0000 4 135 105 3000 4050 1\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 3000 4425 1\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 3000 3675 1\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 3750 7725 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 6375 2925 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 11025 5850 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 10950 3675 n\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 7500 1800 1\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 9750 8625 1\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 10725 5850 n\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 4125 9900 1\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 10350 5850 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 5625 10950 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 7650 10950 n\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 4800 9900 1\001
-4 0 0 50 -1 16 12 0.0000 4 135 105 8175 9900 1\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 9375 7725 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 6075 4875 n\001
-4 0 0 50 -1 16 12 0.0000 4 105 105 5475 5550 n\001
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
deleted file mode 100644
index 0feed84..0000000
--- a/libosinfo.spec.in
+++ /dev/null
@@ -1,144 +0,0 @@
-# -*- rpm-spec -*-
-
-# Plugin isn't ready for real world use yet - it needs
-# a security audit at very least
-%define with_plugin 0
-
-%define with_gir 0
-
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%define with_gir 1
-%endif
-
-Summary: A library for managing OS information for virtualization
-Name: libosinfo
-Version: @VERSION@
-Release: 1%{?dist}%{?extra_release}
-License: LGPLv2+
-Group: Development/Libraries
-Source: https://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://libosinfo.org/
-BuildRequires: intltool
-BuildRequires: glib2-devel
-BuildRequires: check-devel
-BuildRequires: libxml2-devel >= 2.6.0
-BuildRequires: libxslt-devel >= 1.0.0
-BuildRequires: vala
-BuildRequires: vala-tools
-BuildRequires: libsoup-devel
-BuildRequires: /usr/bin/pod2man
-BuildRequires: hwdata
-%if %{with_gir}
-BuildRequires: gobject-introspection-devel
-%endif
-Requires: hwdata
-
-%description
-libosinfo is a library that allows virtualization provisioning tools to
-determine the optimal device settings for a hypervisor/operating system
-combination.
-
-%package devel
-Summary: Libraries, includes, etc. to compile with the libosinfo library
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: glib2-devel
-
-%description devel
-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.
-
-%prep
-%setup -q
-
-%build
-%if %{with_gir}
-%define gir_arg --enable-introspection=yes
-%else
-%define gir_arg --enable-introspection=no
-%endif
-
-%configure %{gir_arg} --enable-vala=yes
-%__make %{?_smp_mflags} V=1
-
-chmod a-x examples/*.js examples/*.py
-
-%install
-rm -fr %{buildroot}
-%__make install DESTDIR=%{buildroot}
-rm -f %{buildroot}%{_libdir}/*.a
-rm -f %{buildroot}%{_libdir}/*.la
-
-%find_lang %{name}
-
-%check
-make check
-
-%clean
-rm -fr %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files -f %{name}.lang
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING.LIB NEWS README
-%{_bindir}/osinfo-detect
-%{_bindir}/osinfo-db-validate
-%{_bindir}/osinfo-query
-%{_bindir}/osinfo-install-script
-%dir %{_datadir}/libosinfo/
-%dir %{_datadir}/libosinfo/db/
-%dir %{_datadir}/libosinfo/schemas/
-%{_datadir}/libosinfo/db/datamap
-%{_datadir}/libosinfo/db/device
-%{_datadir}/libosinfo/db/os
-%{_datadir}/libosinfo/db/platform
-%{_datadir}/libosinfo/db/install-script
-%{_datadir}/libosinfo/schemas/libosinfo.rng
-%{_mandir}/man1/osinfo-db-validate.1*
-%{_mandir}/man1/osinfo-detect.1*
-%{_mandir}/man1/osinfo-query.1*
-%{_mandir}/man1/osinfo-install-script.1*
-%{_libdir}/%{name}-1.0.so.*
-%if %{with_gir}
-%{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
-%endif
-
-%files devel
-%defattr(-, root, root)
-%doc examples/demo.js
-%doc examples/demo.py
-%{_libdir}/%{name}-1.0.so
-%dir %{_includedir}/%{name}-1.0/
-%dir %{_includedir}/%{name}-1.0/osinfo/
-%{_includedir}/%{name}-1.0/osinfo/*.h
-%{_libdir}/pkgconfig/%{name}-1.0.pc
-%if %{with_gir}
-%{_datadir}/gir-1.0/Libosinfo-1.0.gir
-%endif
-%{_datadir}/gtk-doc/html/Libosinfo
-
-%files vala
-%defattr(-, root, root)
-%{_datadir}/vala/vapi/libosinfo-1.0.vapi
-
-%changelog
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
deleted file mode 100644
index 16c5699..0000000
--- a/mingw-libosinfo.spec.in
+++ /dev/null
@@ -1,141 +0,0 @@
-%{?mingw_package_header}
-
-Name: mingw-libosinfo
-Version: @VERSION@
-Release: 1%{?dist}%{?extra_release}
-Summary: MinGW Windows port of a library for managing OS information for virtualization
-License: LGPLv2+
-Group: Development/Libraries
-Source: https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-%{version}.tar.gz
-URL: https://fedorahosted.org/libosinfo/
-
-BuildArch: noarch
-
-BuildRequires: intltool
-
-BuildRequires: mingw32-filesystem >= 95
-BuildRequires: mingw64-filesystem >= 95
-BuildRequires: mingw32-gcc
-BuildRequires: mingw64-gcc
-BuildRequires: mingw32-binutils
-BuildRequires: mingw64-binutils
-
-BuildRequires: mingw32-glib2
-BuildRequires: mingw64-glib2
-BuildRequires: mingw32-libxml2
-BuildRequires: mingw64-libxml2
-BuildRequires: mingw32-libxslt
-BuildRequires: mingw64-libxslt
-BuildRequires: mingw32-libsoup
-BuildRequires: mingw64-libsoup
-
-BuildRequires: pkgconfig
-
-BuildRequires: /usr/bin/pod2man
-
-%description
-libosinfo is a library that allows virtualization provisioning tools to
-determine the optimal device settings for a hypervisor/operating system
-combination.
-
-%package -n mingw32-libosinfo
-Summary: %{summary}
-
-Requires: pkgconfig
-
-%description -n mingw32-libosinfo
-libosinfo is a library that allows virtualization provisioning tools to
-determine the optimal device settings for a hypervisor/operating system
-combination.
-
-%package -n mingw64-libosinfo
-Summary: %{summary}
-
-Requires: pkgconfig
-
-%description -n mingw64-libosinfo
-libosinfo is a library that allows virtualization provisioning tools to
-determine the optimal device settings for a hypervisor/operating system
-combination.
-
-%{?mingw_debug_package}
-
-%prep
-%setup -q -n libosinfo-%{version}
-
-%build
-%mingw_configure \
- --enable-introspection=no \
- --enable-tests=no
-
-%mingw_make %{?_smp_mflags}
-
-
-%install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
-
-# Remove static libraries but DON'T remove *.dll.a files.
-rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libosinfo-1.0.a
-rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libosinfo-1.0.a
-
-# Libtool files don't need to be bundled
-find $RPM_BUILD_ROOT -name "*.la" -delete
-
-# Manpages don't need to be bundled
-rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
-rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
-
-rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
-rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
-
-%files -n mingw32-libosinfo
-%doc AUTHORS ChangeLog COPYING.LIB NEWS README
-%{mingw32_bindir}/osinfo-detect.exe
-%{mingw32_bindir}/osinfo-db-validate.exe
-%{mingw32_bindir}/osinfo-install-script.exe
-%{mingw32_bindir}/osinfo-query.exe
-%{mingw32_bindir}/libosinfo-1.0-0.dll
-%{mingw32_libdir}/libosinfo-1.0.dll.a
-%{mingw32_libdir}/pkgconfig/libosinfo-1.0.pc
-%dir %{mingw32_includedir}/libosinfo-1.0/
-%dir %{mingw32_includedir}/libosinfo-1.0/osinfo
-%{mingw32_includedir}/libosinfo-1.0/osinfo/*.h
-%dir %{mingw32_datadir}/libosinfo
-%dir %{mingw32_datadir}/libosinfo/db
-%dir %{mingw32_datadir}/libosinfo/schemas
-%{mingw32_datadir}/libosinfo/usb.ids
-%{mingw32_datadir}/libosinfo/pci.ids
-%{mingw32_datadir}/libosinfo/db/datamap
-%{mingw32_datadir}/libosinfo/db/device
-%{mingw32_datadir}/libosinfo/db/os
-%{mingw32_datadir}/libosinfo/db/platform
-%{mingw32_datadir}/libosinfo/db/install-script
-%{mingw32_datadir}/libosinfo/schemas/libosinfo.rng
-%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
-
-%files -n mingw64-libosinfo
-%doc AUTHORS ChangeLog COPYING.LIB NEWS README
-%{mingw64_bindir}/osinfo-detect.exe
-%{mingw64_bindir}/osinfo-db-validate.exe
-%{mingw64_bindir}/osinfo-install-script.exe
-%{mingw64_bindir}/osinfo-query.exe
-%{mingw64_bindir}/libosinfo-1.0-0.dll
-%{mingw64_libdir}/libosinfo-1.0.dll.a
-%{mingw64_libdir}/pkgconfig/libosinfo-1.0.pc
-%dir %{mingw64_includedir}/libosinfo-1.0/
-%dir %{mingw64_includedir}/libosinfo-1.0/osinfo
-%{mingw64_includedir}/libosinfo-1.0/osinfo/*.h
-%dir %{mingw64_datadir}/libosinfo
-%dir %{mingw64_datadir}/libosinfo/db
-%dir %{mingw64_datadir}/libosinfo/schemas
-%{mingw64_datadir}/libosinfo/usb.ids
-%{mingw64_datadir}/libosinfo/pci.ids
-%{mingw64_datadir}/libosinfo/db/datamap
-%{mingw64_datadir}/libosinfo/db/device
-%{mingw64_datadir}/libosinfo/db/os
-%{mingw64_datadir}/libosinfo/db/platform
-%{mingw64_datadir}/libosinfo/db/install-script
-%{mingw64_datadir}/libosinfo/schemas/libosinfo.rng
-%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
-
-%changelog
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
new file mode 100644
index 0000000..750b060
--- /dev/null
+++ b/mingw-osinfo-db-tools.spec.in
@@ -0,0 +1,85 @@
+%{?mingw_package_header}
+
+Name: mingw-osinfo-db-tools
+Version: @VERSION@
+Release: 1%{?dist}%{?extra_release}
+Summary: MinGW Windows port of a library for managing OS information for virtualization
+License: LGPLv2+
+Group: Development/Libraries
+Source: https://fedorahosted.org/releases/l/i/libosinfo/osinfo-db-tools-%{version}.tar.gz
+URL: https://fedorahosted.org/libosinfo/
+
+BuildArch: noarch
+
+BuildRequires: intltool
+
+BuildRequires: mingw32-filesystem >= 95
+BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw32-gcc
+BuildRequires: mingw64-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw64-binutils
+
+BuildRequires: mingw32-glib2
+BuildRequires: mingw64-glib2
+BuildRequires: mingw32-libxml2
+BuildRequires: mingw64-libxml2
+BuildRequires: mingw32-libxslt
+BuildRequires: mingw64-libxslt
+BuildRequires: mingw32-libsoup
+BuildRequires: mingw64-libsoup
+
+BuildRequires: pkgconfig
+
+BuildRequires: /usr/bin/pod2man
+
+%description
+This package provides tools for managing the osinfo database of
+information about operating systems for use with virtualization
+
+%package -n mingw32-osinfo-db-tools
+Summary: %{summary}
+
+Requires: pkgconfig
+
+%description -n mingw32-osinfo-db-tools
+This package provides tools for managing the osinfo database of
+information about operating systems for use with virtualization
+
+%package -n mingw64-osinfo-db-tools
+Summary: %{summary}
+
+Requires: pkgconfig
+
+%description -n mingw64-osinfo-db-tools
+This package provides tools for managing the osinfo database of
+information about operating systems for use with virtualization
+
+%{?mingw_debug_package}
+
+%prep
+%setup -q -n osinfo-db-tools-%{version}
+
+%build
+%mingw_configure
+%mingw_make %{?_smp_mflags}
+
+
+%install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+
+# Manpages don't need to be bundled
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
+
+%files -n mingw32-osinfo-db-tools
+%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{mingw32_bindir}/osinfo-db-validate.exe
+%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
+
+%files -n mingw64-osinfo-db-tools
+%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{mingw64_bindir}/osinfo-db-validate.exe
+%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
+
+%changelog
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
new file mode 100644
index 0000000..6285ff1
--- /dev/null
+++ b/osinfo-db-tools.spec.in
@@ -0,0 +1,39 @@
+# -*- rpm-spec -*-
+
+Summary: Tools for managing the osinfo database
+Name: osinfo-db-tools
+Version: @VERSION@
+Release: 1%{?dist}%{?extra_release}
+License: LGPLv2+
+Group: Development/Libraries
+Source: https://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz
+URL: http://libosinfo.org/
+BuildRequires: intltool
+BuildRequires: glib2-devel
+BuildRequires: libxml2-devel >= 2.6.0
+BuildRequires: libxslt-devel >= 1.0.0
+BuildRequires: /usr/bin/pod2man
+
+%description
+This package provides tools for managing the osinfo database of
+information about operating systems for use with virtualization
+
+%prep
+%setup -q
+
+%build
+%configure
+%__make %{?_smp_mflags} V=1
+
+%install
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{name}
+
+%files -f %{name}.lang
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{_bindir}/osinfo-db-validate
+%{_mandir}/man1/osinfo-db-validate.1*
+
+%changelog
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..265ad73
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,95 @@
+af
+am
+anp
+ar
+as
+ast
+bal
+be
+bg
+bn_IN
+bn
+bo
+br
+brx
+bs
+ca
+cs
+cy
+da
+de_CH
+de
+el
+en_GB
+eo
+es
+et
+eu
+fa
+fi
+fr
+gl
+gu
+he
+hi
+hr
+hu
+ia
+id
+ilo
+is
+it
+ja
+ka
+kk
+km
+kn
+ko
+kw_GB
+kw@kkcor
+kw
+kw@uccor
+ky
+lt
+lv
+mai
+mk
+ml
+mn
+mr
+ms
+nb
+nds
+ne
+nl
+nn
+nso
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+si
+sk
+sl
+sq
+sr@latin
+sr
+sv
+ta
+te
+tg
+th
+tr
+tw
+uk
+ur
+vi
+wba
+yo
+zh_CN
+zh_HK
+zh_TW
+zu
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..31b35e2
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1 @@
+tools/osinfo-db-validate.c
diff --git a/po/zanata.xml b/po/zanata.xml
new file mode 100644
index 0000000..035627e
--- /dev/null
+++ b/po/zanata.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<config xmlns="http://zanata.org/namespace/config/";>
+ <url>https://fedora.zanata.org/</url>
+ <project>osinfo-db-tools</project>
+ <project-version>master</project-version>
+ <project-type>gettext</project-type>
+
+ <locales>
+ <locale>sq</locale>
+ <locale>ar</locale>
+ <locale>as</locale>
+ <locale>ast</locale>
+ <locale>bal</locale>
+ <locale>eu</locale>
+ <locale>bn</locale>
+ <locale>bn-IN</locale>
+ <locale>brx</locale>
+ <locale>bs</locale>
+ <locale>br</locale>
+ <locale>bg</locale>
+ <locale>ca</locale>
+ <locale>zh-CN</locale>
+ <locale>zh-HK</locale>
+ <locale>zh-TW</locale>
+ <locale>kw</locale>
+ <locale>kw-GB</locale>
+ <locale>cs</locale>
+ <locale>da</locale>
+ <locale>nl</locale>
+ <locale>en-GB</locale>
+ <locale>eo</locale>
+ <locale>et</locale>
+ <locale>fi</locale>
+ <locale>fr</locale>
+ <locale>gl</locale>
+ <locale>ka</locale>
+ <locale>de</locale>
+ <locale>el</locale>
+ <locale>gu</locale>
+ <locale>he</locale>
+ <locale>hi</locale>
+ <locale>hu</locale>
+ <locale>is</locale>
+ <locale>id</locale>
+ <locale>ia</locale>
+ <locale>it</locale>
+ <locale>ja</locale>
+ <locale>kn</locale>
+ <locale>kk</locale>
+ <locale>km</locale>
+ <locale>ky</locale>
+ <locale>ko</locale>
+ <locale>lt</locale>
+ <locale>nds</locale>
+ <locale>mk</locale>
+ <locale>mai</locale>
+ <locale>ms</locale>
+ <locale>ml</locale>
+ <locale>mr</locale>
+ <locale>mn</locale>
+ <locale>ne</locale>
+ <locale>nb</locale>
+ <locale>nn</locale>
+ <locale>or</locale>
+ <locale>pa</locale>
+ <locale>fa</locale>
+ <locale>pl</locale>
+ <locale>pt</locale>
+ <locale>pt-BR</locale>
+ <locale>ro</locale>
+ <locale>ru</locale>
+ <locale>sr</locale>
+ <locale>sr@latin</locale>
+ <locale>si</locale>
+ <locale>sk</locale>
+ <locale>sl</locale>
+ <locale>es</locale>
+ <locale>sv</locale>
+ <locale>tg</locale>
+ <locale>ta</locale>
+ <locale>te</locale>
+ <locale>bo</locale>
+ <locale>tr</locale>
+ <locale>uk</locale>
+ <locale>ur</locale>
+ <locale>wba</locale>
+ <locale>cy</locale>
+ <locale>lv</locale>
+ <locale>kw@uccor</locale>
+ <locale>kw@kkcor</locale>
+ <locale>af</locale>
+ <locale>am</locale>
+ <locale>be</locale>
+ <locale>hr</locale>
+ <locale>de-CH</locale>
+ <locale>th</locale>
+ <locale>vi</locale>
+ <locale>zu</locale>
+ <locale>ilo</locale>
+ <locale>nso</locale>
+ <locale>tw</locale>
+ <locale>yo</locale>
+ <locale>anp</locale>
+ </locales>
+
+</config>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7f7249f..97a9cb6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,9 +8,9 @@ AM_CFLAGS = $(GOBJECT_CFLAGS) \
-I$(top_srcdir) \
$(NULL)
-bin_PROGRAMS = osinfo-detect osinfo-db-validate osinfo-query osinfo-install-script
+bin_PROGRAMS = osinfo-db-validate
-man1_MANS = osinfo-db-validate.1 osinfo-detect.1 osinfo-query.1 osinfo-install-script.1
+man1_MANS = osinfo-db-validate.1
CLEANFILES = $(man1_MANS)
@@ -19,29 +19,8 @@ POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
%.1: %.c Makefile
$(AM_V_GEN)$(POD2MAN) $< $@
-osinfo_detect_SOURCES = osinfo-detect.c
-osinfo_detect_LDADD = $(GOBJECT_LIBS) \
- $(GIO_LIBS) \
- $(GLIB_LIBS) \
- $(LIBXML_LIBS) \
- $(top_builddir)/osinfo/libosinfo-1.0.la
-
osinfo_db_validate_SOURCES = osinfo-db-validate.c
osinfo_db_validate_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
- $(LIBXML_LIBS) \
- $(top_builddir)/osinfo/libosinfo-1.0.la
-
-osinfo_query_SOURCES = osinfo-query.c
-osinfo_query_LDADD = $(GOBJECT_LIBS) \
- $(GIO_LIBS) \
- $(GLIB_LIBS) \
- $(top_builddir)/osinfo/libosinfo-1.0.la
-
-osinfo_install_script_SOURCES = osinfo-install-script.c
-osinfo_install_script_LDADD = $(GOBJECT_LIBS) \
- $(GIO_LIBS) \
- $(GLIB_LIBS) \
- $(LIBXML_LIBS) \
- $(top_builddir)/osinfo/libosinfo-1.0.la
+ $(LIBXML_LIBS)
--
2.5.5
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
