- Drop ids.tar.bz2 in favor of using hwdata. (boo#1159838)
OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=93
This commit is contained in:
parent
b766fde06c
commit
198ca86f06
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d7da0e4e26604844b86826a3739e9ed085d4437b53240d2e167d6b964be33ccc
|
||||
size 454135
|
@ -1,14 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 7 16:33:09 MST 2020 - carnold@suse.com
|
||||
Wed Jan 8 08:47:59 MST 2020 - carnold@suse.com
|
||||
|
||||
- Update ids.tar.bz2 with latest versions of pci.ids and usb.ids.
|
||||
(boo#1159838)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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)
|
||||
- Drop ids.tar.bz2 in favor of using hwdata. (boo#1159838)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 27 09:30:02 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libosinfo
|
||||
#
|
||||
# Copyright (c) 2020 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
|
||||
@ -27,11 +27,8 @@ License: LGPL-2.1-or-later AND GPL-2.0-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
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
|
||||
@ -57,10 +54,8 @@ 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
|
||||
@ -94,7 +89,7 @@ as well as Vala bindings for the libosinfo library.
|
||||
%lang_package
|
||||
%endif
|
||||
%prep
|
||||
%setup -q -a 1
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%meson \
|
||||
@ -109,11 +104,6 @@ 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
|
||||
|
||||
@ -128,11 +118,6 @@ install -m 644 usb.ids %{buildroot}/%{_datadir}/libosinfo/
|
||||
%{_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)
|
||||
|
Loading…
Reference in New Issue
Block a user