- updated to 0.8.1

diff --git a/fwupd.spec b/fwupd.spec
index b7d441bfc133f9a92a721751d2387516d9666e08..f04ecb5131cb54bc82a7d545081f51e0204d6879 100644 (file)
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -1,21 +1,22 @@
+# TODO: libtbtfwu >= 1, polkit >= 0.114 when available
 #
 # Conditional build:
 %bcond_without colorhug        # ColorHug support
-%bcond_without efi             # UEFI support
+%bcond_without efi             # UEFI (and dell) support
 %bcond_without static_libs     # static library
 
-%ifnarch %{ix86} %{x8664} arm aarch64 ia64
+%ifnarch %{ix86} %{x8664} %{arm} aarch64 ia64
 %undefine      with_efi
 %endif
 Summary:       System daemon for installing device firmware
 Summary(pl.UTF-8):     Demon systemowy do instalowania firmware'u urządzeń
 Name:          fwupd
-Version:       0.7.2
-Release:       3
+Version:       0.8.1
+Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: e5747d009b70d4e00cc55862e5a0bfe6
+# Source0-md5: 067fedb99a40e8c877bd9c25ee3ca8e6
 Patch0:                %{name}-sh.patch
 URL:           https://github.com/hughsie/fwupd
 BuildRequires: appstream-glib-devel >= 0.5.10
@@ -23,7 +24,10 @@ BuildRequires:       autoconf >= 2.63
 BuildRequires: automake >= 1:1.9
 %{?with_colorhug:BuildRequires:        colord-devel >= 1.2.12}
 BuildRequires: docbook-utils
-%{?with_efi:BuildRequires:     fwupdate-devel >= 0.5}
+%{?with_efi:BuildRequires:     efivar-devel}
+# pkgconfig(libelf); can be also libelf-devel
+BuildRequires: elfutils-devel >= 0.166
+%{?with_efi:BuildRequires:     fwupdate-devel >= 5}
 BuildRequires: gcab-devel
 BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.45.8
@@ -34,8 +38,10 @@ BuildRequires:       intltool >= 0.35.0
 BuildRequires: libarchive-devel
 BuildRequires: libgpg-error-devel
 BuildRequires: libgusb-devel >= 0.2.9
+# for dell (which depends on fwupdate too)
+%{?with_efi:BuildRequires:     libsmbios-devel >= 2.3.0}
 BuildRequires: libsoup-devel >= 2.52
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.103
@@ -47,7 +53,7 @@ BuildRequires:        xz
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      appstream-glib >= 0.5.10
 %{?with_colorhug:Requires:     colord-libs >= 1.2.12}
-%{?with_efi:Requires:  fwupdate-libs >= 0.5}
+%{?with_efi:Requires:  fwupdate-libs >= 5}
 Requires:      libgusb >= 0.2.9
 Requires:      libsoup >= 2.52
 Requires:      polkit >= 0.103
@@ -143,14 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{dfu,fwupd}.la
 # loadable modules
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/fwupd-plugins-1/lib*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/fwupd-plugins-2/lib*.la
 %if %{with static_libs}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/fwupd-plugins-1/lib*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/fwupd-plugins-2/lib*.a
 %endif
 
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{hi_IN,hi}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{nl_NL,nl}
-
 %find_lang %{name}
 
 %clean
@@ -165,9 +168,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dfu-tool
 %attr(755,root,root) %{_bindir}/fwupdmgr
 %attr(755,root,root) %{_libexecdir}/fwupd
-%dir %{_libdir}/fwupd-plugins-1
-%attr(755,root,root) %{_libdir}/fwupd-plugins-1/libfu_plugin_test.so
-%attr(755,root,root) %{_libdir}/fwupd-plugins-1/libfu_plugin_steelseries.so
+%dir %{_libdir}/fwupd-plugins-2
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_altos.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_colorhug.so
+%if %{with efi}
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_dell.so
+%endif
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_dfu.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_ebitdo.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_raspberrypi.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_steelseries.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_synapticsmst.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_test.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_udev.so
+%if %{with efi}
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_uefi.so
+%endif
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_unifying.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_upower.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_usb.so
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd.conf
 %dir /etc/pki/fwupd
 /etc/pki/fwupd/GPG-KEY-Hughski-Limited