[packages/libosinfo] - updated to 0.2.6 - use system {pci,usb}.ids (from hwdata package) - added destdir patch (fixes ins

[qboosh]

commit bc63ea3ea4676ce2472e3c01ee8caae0e9bbfc22
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 23 10:05:00 2013 +0100

    - updated to 0.2.6
    - use system {pci,usb}.ids (from hwdata package)
    - added destdir patch (fixes install in such case)

 libosinfo-destdir.patch | 20 ++++++++++++++++++++
 libosinfo.spec          | 15 +++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/libosinfo.spec b/libosinfo.spec
index f76b1de..7d5a2c6 100644
--- a/libosinfo.spec
+++ b/libosinfo.spec
@@ -7,12 +7,13 @@
 Summary:	A library for managing OS information for virtualization
 Summary(pl.UTF-8):	Biblioteka do zarządzania informacjami dotyczącymi OS na potrzeby wirtualizacji
 Name:		libosinfo
-Version:	0.2.5
+Version:	0.2.6
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz
-# Source0-md5:	02b6b6270dd0ef500a5f1c8b89c04b38
+# Source0-md5:	2bcf0b244fc206a4003e2cea8c8568c6
+Patch0:		%{name}-destdir.patch
 URL:		https://fedorahosted.org/libosinfo/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11.1
@@ -28,6 +29,9 @@ BuildRequires:	libxml2-devel >= 1:2.6.0
 BuildRequires:	libxslt-devel >= 1.0.0
 BuildRequires:	pkgconfig
 %{?with_vala:BuildRequires:	vala}
+Requires:	/lib/hwdata/pci.ids
+Requires:	/lib/hwdata/usb.ids
+Requires:	hwdata >= 0.243-5
 Requires:	libxml2 >= 1:2.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,6 +98,7 @@ API libosinfo dla języka Vala.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -103,11 +108,13 @@ API libosinfo dla języka Vala.
 %{__automake}
 %configure \
 	%{__enable_disable apidocs gtk-doc} \
-	--with-html-dir=%{_gtkdocdir} \
 	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static} \
+	--enable-udev \
 	%{!?with_vala:--disable-vala} \
-	--enable-udev
+	--with-html-dir=%{_gtkdocdir} \
+	--with-pci-ids-path=/lib/hwdata/pci.ids \
+	--with-usb-ids-path=/lib/hwdata/usb.ids
 %{__make}
 
 %install
diff --git a/libosinfo-destdir.patch b/libosinfo-destdir.patch
new file mode 100644
index 0000000..6e66ebb
--- /dev/null
+++ b/libosinfo-destdir.patch
@@ -0,0 +1,20 @@
+--- libosinfo-0.2.6/data/Makefile.am.orig	2013-03-13 01:50:59.000000000 +0100
++++ libosinfo-0.2.6/data/Makefile.am	2013-03-23 09:21:34.776606356 +0100
+@@ -11,7 +11,7 @@
+ 	-wget -q -O $@ http://www.linux-usb.org/usb.ids
+ else
+ usb_ids_install:
+-	$(LN_S) $(USB_IDS) $(pkgdatadir)/db/usb.ids
++	$(LN_S) $(USB_IDS) $(DESTDIR)$(pkgdatadir)/db/usb.ids
+ INSTALL_DATA_HOOK_DEPS += usb_ids_install
+ endif
+ 
+@@ -22,7 +22,7 @@
+ 	-wget -q -O $@ http://pciids.sourceforge.net/v2.2/pci.ids
+ else
+ pci_ids_install:
+-	$(LN_S) $(PCI_IDS) $(pkgdatadir)/db/pci.ids
++	$(LN_S) $(PCI_IDS) $(DESTDIR)$(pkgdatadir)/db/pci.ids
+ INSTALL_DATA_HOOK_DEPS += pci_ids_install
+ endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libosinfo.git/commitdiff/bc63ea3ea4676ce2472e3c01ee8caae0e9bbfc22