-# TODO: libtbtfwu >= 1, polkit >= 0.114 when available
+# TODO: polkit >= 0.114 when available
#
# Conditional build:
%bcond_without colorhug # ColorHug support
%bcond_without efi # UEFI (and dell) support
-%bcond_without static_libs # static library
%bcond_without thunderbolt # Thunderbolt support
-%ifnarch %{ix86} %{x8664} %{arm} aarch64 ia64
+%ifnarch %{ix86} %{x8664} x32 %{arm} aarch64 ia64
%undefine with_efi
%endif
+%if %{without efi}
+%undefine with_thunderbolt
+%endif
Summary: System daemon for installing device firmware
Summary(pl.UTF-8): Demon systemowy do instalowania firmware'u urządzeń
Name: fwupd
-Version: 0.8.1
+Version: 1.0.2
Release: 1
-License: GPL v2
+License: LGPL v2.1+
Group: Applications/System
Source0: https://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 067fedb99a40e8c877bd9c25ee3ca8e6
-Patch0: %{name}-sh.patch
+# Source0-md5: 9e5986756383b227ba78f0afce4b1ace
URL: https://github.com/hughsie/fwupd
BuildRequires: appstream-glib-devel >= 0.5.10
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.9
%{?with_colorhug:BuildRequires: colord-devel >= 1.2.12}
BuildRequires: docbook-utils
+BuildRequires: docbook-dtd41-sgml
%{?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: gettext-tools >= 0.19.7
BuildRequires: glib2-devel >= 1:2.45.8
BuildRequires: gobject-introspection-devel >= 0.9.8
BuildRequires: gpgme-devel
BuildRequires: libsoup-devel >= 2.52
# pkgconfig(libtbtfwu) >= 1
%{?with_thunderbolt:BuildRequires: libtbtfwu-devel >= 0-0.2017.01.19}
-BuildRequires: libtool >= 2:2
BuildRequires: libxslt-progs
+BuildRequires: meson >= 0.37.0
+BuildRequires: ninja >= 1.6
BuildRequires: pkgconfig
BuildRequires: polkit-devel >= 0.103
-BuildRequires: rpmbuild(macros) >= 1.644
+BuildRequires: python3-pillow
+BuildRequires: python3-pycairo
+BuildRequires: rpmbuild(macros) >= 1.726
BuildRequires: sqlite3-devel >= 3
+BuildRequires: systemd-units
BuildRequires: tar >= 1:1.22
+BuildRequires: udev-devel
BuildRequires: udev-glib-devel
BuildRequires: xz
Requires: %{name}-libs = %{version}-%{release}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: glib2-devel >= 1:2.45.8
+Obsoletes: fwupd-static
%description devel
Header files for fwupd libraries.
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek fwupd.
-%package static
-Summary: Static fwupd libraries
-Summary(pl.UTF-8): Statyczne biblioteki fwupd
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static fwupd libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki fwupd.
-
%package apidocs
Summary: API documentation for fwupd libraries
Summary(pl.UTF-8): Dokumentacja API do bibliotek fwupd
%prep
%setup -q
-%patch0 -p1
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-silent-rules \
- %{!?with_static_libs:--disable-static} \
- %{!?with_thunderbolt:--disable-thunderbolt} \
- %{!?with_efi:--disable-uefi} \
- --with-html-dir=%{_gtkdocdir} \
- --with-systemdunitdir=%{systemdunitdir}
-%{__make}
+%meson build \
+ -Denable-tests=false \
+ %{!?with_thunderbolt:-Denable-thunderbolt=false} \
+ %{!?with_efi:-Denable-uefi=false} \
+ %{!?with_efi:-Denable-dell=false}
+
+%meson_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$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-2/lib*.la
-%if %{with static_libs}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/fwupd-plugins-2/lib*.a
-%endif
+%meson_install -C build
%find_lang %{name}
%attr(755,root,root) %{_bindir}/dfu-tool
%attr(755,root,root) %{_bindir}/fwupdmgr
%attr(755,root,root) %{_libexecdir}/fwupd
-%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
+%dir %{_libdir}/fwupd-plugins-3
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so
+%if %{with efi}
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so
+%endif
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_nitrokey.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_raspberrypi.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_steelseries.so
%if %{with efi}
-%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_dell.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_synapticsmst.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
%if %{with thunderbolt}
-%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_thunderbolt.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt_power.so
%endif
-%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_udev.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_udev.so
%if %{with efi}
-%attr(755,root,root) %{_libdir}/fwupd-plugins-2/libfu_plugin_uefi.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/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
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_unifying.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so
+%dir %{_sysconfdir}/fwupd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/daemon.conf
+%dir %{_sysconfdir}/fwupd/remotes.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/fwupd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/lvfs-testing.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/lvfs.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/vendor.conf
%dir /etc/pki/fwupd
/etc/pki/fwupd/GPG-KEY-Hughski-Limited
/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service
+/etc/pki/fwupd/LVFS-CA.pem
%dir /etc/pki/fwupd-metadata
/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service
+/etc/pki/fwupd-metadata/LVFS-CA.pem
%{systemdunitdir}/fwupd.service
%{systemdunitdir}/fwupd-offline-update.service
%{systemdunitdir}/system-update.target.wants/fwupd-offline-update.service
/lib/udev/rules.d/90-fwupd-devices.rules
/etc/dbus-1/system.d/org.freedesktop.fwupd.conf
-# XXX: dir shared with AppStream
-%dir %{_datadir}/app-info
-%dir %{_datadir}/app-info/xmls
-%{_datadir}/app-info/xmls/org.freedesktop.fwupd.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
+%dir %{_datadir}/fwupd
+%attr(755,root,root) %{_datadir}/fwupd/firmware-packager
+%dir %{_datadir}/fwupd/quirks.d
+%{_datadir}/fwupd/quirks.d/dell.quirk
+%{_datadir}/fwupd/quirks.d/dfu.quirk
+%dir %{_datadir}/fwupd/remotes.d
+%{_datadir}/fwupd/remotes.d/fwupd
+%{_datadir}/fwupd/remotes.d/vendor
+%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
-%dir /var/cache/app-info
-%dir /var/cache/app-info/icons
-%dir /var/cache/app-info/xmls
%dir /var/lib/fwupd
+%dir /var/lib/fwupd/builder
+/var/lib/fwupd/builder/README.md
%{_mandir}/man1/dfu-tool.1*
%{_mandir}/man1/fwupdmgr.1*
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdfu.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdfu.so.1
+%{_libdir}/girepository-1.0/Fwupd-2.0.typelib
%attr(755,root,root) %{_libdir}/libfwupd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfwupd.so.1
-%{_libdir}/girepository-1.0/Dfu-1.0.typelib
-%{_libdir}/girepository-1.0/Fwupd-1.0.typelib
+%attr(755,root,root) %ghost %{_libdir}/libfwupd.so.2
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libfwupd.so
-%attr(755,root,root) %{_libdir}/libdfu.so
-%{_includedir}/dfu.h
%{_includedir}/fwupd-1
-%{_includedir}/libdfu
-%{_datadir}/gir-1.0/Dfu-1.0.gir
-%{_datadir}/gir-1.0/Fwupd-1.0.gir
+%{_datadir}/gir-1.0/Fwupd-2.0.gir
%{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
-%{_pkgconfigdir}/dfu.pc
%{_pkgconfigdir}/fwupd.pc
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libdfu.a
-%{_libdir}/libfwupd.a
-%endif
-
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/libdfu
%{_gtkdocdir}/libfwupd