diff --git a/libosinfo.changes b/libosinfo.changes index a0cbbde..c10628e 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 6 13:56:01 MST 2020 - carnold@suse.com + +- Add conditional build statements for including hwdata. It doesn't + exist on the SLE15-SP2 media. (boo#1159838) + ------------------------------------------------------------------- Fri Dec 27 09:30:02 UTC 2019 - Dominique Leuenberger diff --git a/libosinfo.spec b/libosinfo.spec index c75f8ec..34e90b3 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -1,7 +1,7 @@ # # spec file for package libosinfo # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -25,11 +25,13 @@ Release: 0 Summary: Operating system and hypervisor information management library License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -URL: https://releases.pagure.org/libosinfo/ +Url: https://releases.pagure.org/libosinfo/ Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz Source1: ids.tar.bz2 BuildRequires: gtk-doc +%if 0%{?suse_version} >= 1550 BuildRequires: hwdata +%endif BuildRequires: libcurl-devel BuildRequires: meson BuildRequires: vala @@ -55,8 +57,10 @@ combination. Summary: Operating system and hypervisor information management library Group: System/Libraries Requires: %{name} >= %{version} +%if 0%{?suse_version} >= 1550 # for usb.ids and pci.ids Requires: hwdata +%endif %description -n libosinfo-1_0-0 libosinfo is a library that allows virtualization provisioning tools to @@ -105,6 +109,11 @@ find %{buildroot} -type f -name "*.la" -delete -print %if %{with_lang} %find_lang %{name} %{?no_lang_C} %endif +%if 0%{?suse_version} < 1550 +mkdir -p %{buildroot}/%{_datadir}/libosinfo/ +install -m 644 pci.ids %{buildroot}/%{_datadir}/libosinfo/ +install -m 644 usb.ids %{buildroot}/%{_datadir}/libosinfo/ +%endif %post -n libosinfo-1_0-0 -p /sbin/ldconfig @@ -119,6 +128,11 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man1/osinfo-detect.1%{?ext_man} %{_mandir}/man1/osinfo-install-script.1%{?ext_man} %{_mandir}/man1/osinfo-query.1%{?ext_man} +%if 0%{?suse_version} < 1550 +%dir %{_datadir}/libosinfo/ +%{_datadir}/libosinfo/pci.ids +%{_datadir}/libosinfo/usb.ids +%endif %files -n libosinfo-1_0-0 %defattr(-, root, root)