usbutils no longer ships usb.ids, it is hwdata now, set path manually

remotes/origin/f25
Marc-André Lureau 2017-06-15 16:20:22 +04:00
parent 28f7e519a1
commit 6cf2d1e2c4
1 changed files with 9 additions and 2 deletions

View File

@ -2,7 +2,7 @@
Name: spice-gtk Name: spice-gtk
Version: 0.33 Version: 0.33
Release: 3%{?dist} Release: 4%{?dist}
Summary: A GTK+ widget for SPICE clients Summary: A GTK+ widget for SPICE clients
Group: System Environment/Libraries Group: System Environment/Libraries
@ -28,15 +28,16 @@ BuildRequires: libacl-devel
BuildRequires: polkit-devel BuildRequires: polkit-devel
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: vala-tools BuildRequires: vala-tools
BuildRequires: usbutils
BuildRequires: libsoup-devel >= 2.49.91 BuildRequires: libsoup-devel >= 2.49.91
BuildRequires: libphodav-devel BuildRequires: libphodav-devel
BuildRequires: lz4-devel BuildRequires: lz4-devel
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: spice-protocol >= 0.12.11 BuildRequires: spice-protocol >= 0.12.11
BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel
BuildRequires: hwdata
Obsoletes: spice-gtk-python < 0.32 Obsoletes: spice-gtk-python < 0.32
Requires: hwdata
Requires: spice-glib%{?_isa} = %{version}-%{release} Requires: spice-glib%{?_isa} = %{version}-%{release}
%description %description
@ -110,10 +111,13 @@ find . -name '*.stamp' | xargs touch
%build %build
# usb.ids is shipped by hwdata these days, make sure it stays where expected
test -f /usr/share/hwdata/usb.ids
%configure \ %configure \
--enable-gtk-doc \ --enable-gtk-doc \
--enable-webdav \ --enable-webdav \
--with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/ \ --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/ \
--with-usb-ids-path=/usr/share/hwdata/usb.ids \
--enable-lz4 \ --enable-lz4 \
--enable-vala \ --enable-vala \
--disable-werror --disable-werror
@ -187,6 +191,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%{_bindir}/spicy-stats %{_bindir}/spicy-stats
%changelog %changelog
* Thu Jun 15 2017 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.33-4
- usbutils no longer ships usb.ids, it is hwdata now, set path manually.
* Thu Jun 15 2017 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.33-3 * Thu Jun 15 2017 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.33-3
- Backport fixes for "Couldn't find current GL or GLX context" - Backport fixes for "Couldn't find current GL or GLX context"
Resolves: rhbz#1461802 Resolves: rhbz#1461802