Disable BuildArch: noarch for the labels sub-package

This should make this the last time we need to rebuild for this.

Signed-off-by: Peter Jones <pjones@redhat.com>

.gitignore

@@ -17,3 +17,13 @@
 /fwupd-0.7.0.tar.xz
 /fwupd-0.7.1.tar.xz
 /fwupd-0.7.2.tar.xz
+/fwupd-0.7.3.tar.xz
+/fwupd-0.7.4.tar.xz
+/fwupd-0.7.5.tar.xz
+/fwupd-0.8.0.tar.xz
+/fwupd-0.8.1.tar.xz
+/fwupd-0.8.2.tar.xz
+/fwupd-0.9.2.tar.xz
+/fwupd-0.9.3.tar.xz
+/fwupd-0.9.4.tar.xz
+/fwupd-0.9.5.tar.xz

fwupd.spec

@@ -1,12 +1,25 @@
-%global libglib2_version 2.45.8
-%global libappstream_version 0.5.10
+%global glib2_version 2.45.8
+%global libappstream_version 0.6.13
 %global libgusb_version 0.2.9
 %global libsoup_version 2.51.92
+%global colord_version 1.2.12
+%global systemd_version 231
+
+%global enable_tests 1
+
+%ifarch x86_64 %{ix86}
+%global have_smbios 1
+%endif
+
+# FIXME: should also be aarch64, but efivar not present there yet
+%ifarch x86_64 %{ix86}
+%global have_uefi 1
+%endif
 
 Summary:   Firmware update daemon
 Name:      fwupd
-Version:   0.7.2
-Release:   2%{?dist}
+Version:   0.9.5
+Release:   1%{?dist}
 License:   GPLv2+
 URL:       https://github.com/hughsie/fwupd
 Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
@@ -14,24 +27,41 @@ Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: intltool
 BuildRequires: libappstream-glib-devel >= %{libappstream_version}
 BuildRequires: libgudev1-devel
 BuildRequires: libgusb-devel >= %{libgusb_version}
 BuildRequires: libsoup-devel >= %{libsoup_version}
-BuildRequires: colord-devel >= 1.0.0
+BuildRequires: colord-devel >= %{colord_version}
 BuildRequires: polkit-devel >= 0.103
-BuildRequires: libgcab1-devel
 BuildRequires: sqlite-devel
 BuildRequires: gpgme-devel
-BuildRequires: systemd
+BuildRequires: systemd >= %{systemd_version}
 BuildRequires: libarchive-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gcab
 BuildRequires: valgrind
+BuildRequires: valgrind-devel
+BuildRequires: elfutils-libelf-devel
+BuildRequires: gtk-doc
+BuildRequires: libuuid-devel
+BuildRequires: meson
 
-%ifarch x86_64 %{ix86} aarch64
-BuildRequires: fwupdate-devel >= 0.5
+%if 0%{?have_uefi}
+BuildRequires: python3 python3-cairo python3-gobject python3-pillow
+BuildRequires: pango-devel
+BuildRequires: cairo-devel cairo-gobject-devel
+BuildRequires: freetype
+BuildRequires: fontconfig
+BuildRequires: dejavu-sans-fonts
+BuildRequires: adobe-source-han-sans-cn-fonts
+%endif
+
+%if 0%{?have_smbios}
+BuildRequires: libsmbios-devel >= 2.3.0
+%endif
+
+%if 0%{?have_uefi}
+BuildRequires: fwupdate-devel >= 7
 %endif
 
 Requires(post): systemd
@@ -43,8 +73,10 @@ Requires: glib2%{?_isa} >= %{glib2_version}
 Requires: libappstream-glib%{?_isa} >= %{libappstream_version}
 Requires: libgusb%{?_isa} >= %{libgusb_version}
 Requires: libsoup%{?_isa} >= %{libsoup_version}
+Requires: fwupd-labels = %{version}-%{release}
 
 Obsoletes: fwupd-sign < 0.1.6
+Obsoletes: libebitdo < 0.7.5-3
 
 %description
 fwupd is a daemon to allow session software to update device firmware.
@@ -52,6 +84,7 @@ fwupd is a daemon to allow session software to update device firmware.
 %package devel
 Summary: Development package for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: libebitdo-devel < 0.7.5-3
 
 %description devel
 Files for development with %{name}.
@@ -69,30 +102,66 @@ Requires: libdfu%{?_isa} = %{version}-%{release}
 %description -n libdfu-devel
 Files for development with libdfu.
 
+%package labels
+Summary: Rendered labels for display during system firmware updates.
+# BuildArch: noarch is disabled as we can get "different" .BMP files even when
+# running the build on the same architecture due to the randomness introduced
+# by the TTF files.
+
+%description labels
+Rendered labels for display during system firmware updates.
+
+%package tests
+Summary: Data files for installed tests
+BuildArch: noarch
+
+%description tests
+Data files for installed tests.
+
 %prep
 %setup -q
 
 %build
-%configure \
-        --disable-static        \
-%ifnarch x86_64 %{ix86} aarch64
-        --disable-uefi          \
-%endif
-        --disable-rpath         \
-        --disable-silent-rules  \
-        --disable-dependency-tracking
 
-make %{?_smp_mflags}
+export LANG=C.UTF-8
+%meson \
+    -Denable-doc=true \
+    -Denable-man=true \
+%if 0%{?enable_tests}
+    -Denable-tests=true \
+%else
+    -Denable-tests=false \
+%endif
+    -Denable-thunderbolt=false \
+%if 0%{?have_uefi}
+    -Denable-uefi=true \
+    -Denable-uefi-labels=true \
+%else
+    -Denable-uefi=false \
+    -Denable-uefi-labels=false \
+%endif
+%if 0%{?have_smbios}
+    -Denable-dell=true \
+    -Denable-synaptics=true \
+%else
+    -Denable-dell=false \
+    -Denable-synaptics=false \
+%endif
+    -Denable-colorhug=true
+
+%meson_build
+%if 0%{?enable_tests}
+%meson_test
+%endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+export LANG=C.UTF-8
+%meson_install
+
+mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 
 %find_lang %{name}
 
-%check
-make check VERBOSE=1
-
 %post
 /sbin/ldconfig
 %systemd_post fwupd.service
@@ -104,6 +173,9 @@ make check VERBOSE=1
 /sbin/ldconfig
 %systemd_postun_with_restart fwupd.service
 
+%post -n libdfu -p /sbin/ldconfig
+%postun -n libdfu -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %doc README.md AUTHORS NEWS
 %license COPYING
@@ -111,6 +183,10 @@ make check VERBOSE=1
 %dir %{_libexecdir}/fwupd
 %{_libexecdir}/fwupd/fwupd
 %{_bindir}/fwupdmgr
+%dir %{_sysconfdir}/fwupd
+%dir %{_sysconfdir}/fwupd/remotes.d
+%{_sysconfdir}/fwupd/remotes.d/lvfs.conf
+%{_sysconfdir}/fwupd/remotes.d/lvfs-testing.conf
 %{_sysconfdir}/pki/fwupd
 %{_sysconfdir}/pki/fwupd-metadata
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.fwupd.conf
@@ -120,18 +196,36 @@ make check VERBOSE=1
 %{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
 %{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
 %{_datadir}/man/man1/fwupdmgr.1.gz
+%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
 %{_unitdir}/fwupd-offline-update.service
 %{_unitdir}/fwupd.service
 %{_unitdir}/system-update.target.wants/
 %dir %{_localstatedir}/lib/fwupd
 %{_libdir}/libfwupd*.so.*
 %{_libdir}/girepository-1.0/Fwupd-1.0.typelib
-%dir %{_localstatedir}/cache/app-info
-%dir %{_localstatedir}/cache/app-info/icons
-%dir %{_localstatedir}/cache/app-info/xmls
 /usr/lib/udev/rules.d/*.rules
-%dir %{_libdir}/fwupd-plugins-1
-%{_libdir}/fwupd-plugins-1/*.so
+%dir %{_libdir}/fwupd-plugins-2
+%{_libdir}/fwupd-plugins-2/libfu_plugin_altos.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_amt.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_colorhug.so
+%if 0%{?have_smbios}
+%{_libdir}/fwupd-plugins-2/libfu_plugin_dell.so
+%endif
+%{_libdir}/fwupd-plugins-2/libfu_plugin_dfu.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_ebitdo.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_raspberrypi.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_steelseries.so
+%if 0%{?have_smbios}
+%{_libdir}/fwupd-plugins-2/libfu_plugin_synapticsmst.so
+%endif
+%{_libdir}/fwupd-plugins-2/libfu_plugin_udev.so
+%if 0%{?have_uefi}
+%{_libdir}/fwupd-plugins-2/libfu_plugin_uefi.so
+%endif
+%{_libdir}/fwupd-plugins-2/libfu_plugin_unifying.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_upower.so
+%{_libdir}/fwupd-plugins-2/libfu_plugin_usb.so
+%ghost %{_localstatedir}/lib/fwupd/gnupg
 
 %files devel
 %{_datadir}/gir-1.0/Fwupd-1.0.gir
@@ -155,7 +249,112 @@ make check VERBOSE=1
 %{_libdir}/libdfu*.so
 %{_libdir}/pkgconfig/dfu.pc
 
+%files labels
+%if 0%{?have_uefi}
+%{_datadir}/locale/*/LC_IMAGES/fwupd*
+%endif
+
+%files tests
+%dir %{_datadir}/installed-tests/fwupd
+%{_datadir}/installed-tests/fwupd/firmware-example.xml.gz
+%{_datadir}/installed-tests/fwupd/firmware-example.xml.gz.asc
+%{_datadir}/installed-tests/fwupd/*.test
+%{_datadir}/installed-tests/fwupd/*.cab
+%{_datadir}/installed-tests/fwupd/*.sh
+%{_datadir}/installed-tests/fwupd/*.py*
+
 %changelog
+* Tue Jul 04 2017 Richard Hughes <richard@hughsie.com> 0.9.5-1
+- New upstream release
+- Add a plugin to get the version of the AMT ME interface
+- Allow flashing Unifying devices in bootloader modes
+- Filter by Unifying SwId when making HID++2.0 requests
+- Fix downgrades when version_lowest is set
+- Fix the self tests when running on PPC64 big endian
+- Use the UFY DeviceID prefix for Unifying devices
+
+* Thu Jun 15 2017 Richard Hughes <richard@hughsie.com> 0.9.4-1
+- New upstream release
+- Add installed tests that use the daemon
+- Add the ability to restrict firmware to specific vendors
+- Compile with newer versions of meson
+- Fix a common crash when refreshing metadata
+- Generate a images for status messages during system firmware update
+- Show progress download when refreshing metadata
+- Use the correct type signature in the D-Bus introspection file
+
+* Wed Jun 07 2017 Richard Hughes <richard@hughsie.com> 0.9.3-1
+- New upstream release
+- Add a 'downgrade' command to fwupdmgr
+- Add a 'get-releases' command to fwupdmgr
+- Add support for Microsoft HardwareIDs
+- Allow downloading metadata from more than just the LVFS
+- Allow multiple checksums on devices and releases
+- Correctly open Unifying devices with original factory firmware
+- Do not expect a Unifying reply when issuing a REBOOT command
+- Do not re-download firmware that exists in the cache
+- Fix a problem when testing for a Dell system
+- Fix flashing new firmware to 8bitdo controllers
+
+* Tue May 23 2017 Richard Hughes <richard@hughsie.com> 0.9.2-2
+- Backport several fixes for updating Unifying devices
+
+* Mon May 22 2017 Richard Hughes <richard@hughsie.com> 0.9.2-1
+- New upstream release
+- Add support for Unifying DFU features
+- Do not spew a critial warning when parsing an invalid URI
+- Ensure steelseries device is closed if it returns an invalid packet
+- Ignore spaces in the Unifying version prefix
+
+* Wed Oct 19 2016 Richard Hughes <richard@hughsie.com> 0.7.5-1
+- New upstream release
+- Add quirks for HydraBus as it does not have a DFU runtime
+- Don't create the UEFI dummy device if the unlock will happen on next boot
+- Fix an assert when unlocking the dummy ESRT device
+- Fix writing firmware to devices using the ST reference bootloader
+- Match the Dell TB16 device
+
+* Mon Sep 19 2016 Richard Hughes <richard@hughsie.com> 0.7.4-1
+- New upstream release
+- Add a fallback for older appstream-glib releases
+- Allow the argument to 'dfu-tool set-release' be major.minor
+- Fix a possible crash when uploading firmware files using libdfu
+- Fix libfwupd self tests when a host-provided fwupd is not available
+- Load the Altos USB descriptor from ELF files
+- Show the human-readable version in the 'dfu-tool dump' output
+- Support writing the IHEX symbol table
+- Write the ELF files with the correct section type
+
+* Mon Aug 29 2016 Kalev Lember <klember@redhat.com> 0.7.3-2
+- Fix an unexpanded macro in the spec file
+- Tighten libebitdo-devel requires with the _isa macro
+- Add ldconfig scripts for libdfu and libebitdo subpackages
+
+* Mon Aug 29 2016 Richard Hughes <richard@hughsie.com> 0.7.3-1
+- New upstream release
+- Add Dell TPM and TB15/WD15 support via new Dell provider
+- Add initial ELF reading and writing support to libdfu
+- Add support for installing multiple devices from a CAB file
+- Allow providers to export percentage completion
+- Don't fail while checking versions or locked state
+- Show a progress notification when installing firmware
+- Show the vendor flashing instructions when installing
+- Use a private gnupg key store
+- Use the correct firmware when installing a composite device
+
+* Fri Aug 19 2016 Peter Jones <pjones@redhat.com> - 0.7.2-6
+- Rebuild to get libfwup.so.1 as our fwupdate dep.  This should make this the
+  last time we need to rebuild for this.
+
+* Wed Aug 17 2016 Peter Jones <pjones@redhat.com> - 0.7.2-5
+- rebuild against new efivar and fwupdate
+
+* Fri Aug 12 2016 Adam Williamson <awilliam@redhat.com> - 0.7.2-4
+- rebuild against new efivar and fwupdate
+
+* Thu Aug 11 2016 Richard Hughes <richard@hughsie.com> 0.7.2-3
+- Use the new CDN for firmware metadata
+
 * Thu Jul 14 2016 Kalev Lember <klember@redhat.com> - 0.7.2-2
 - Tighten subpackage dependencies
 
@@ -208,7 +407,7 @@ make check VERBOSE=1
 - Do not misdetect different ColorHug devices
 - Only dump the profiling data when run with --verbose
 
-* Wed Dec 07 2015 Richard Hughes <richard@hughsie.com> 0.6.0-1
+* Mon Dec 07 2015 Richard Hughes <richard@hughsie.com> 0.6.0-1
 - New upstream release
 - Add support for automatically updating USB DFU-capable devices
 - Emit the changed signal after doing an update

sources

@@ -1 +1 @@
-e5747d009b70d4e00cc55862e5a0bfe6  fwupd-0.7.2.tar.xz
+SHA512 (fwupd-0.9.5.tar.xz) = 1a2dc2a67f3cfae6f0e53653ad458563547b21c0943283e7005bf089c92084a90059788440bd9ef24197d1cb2cdf1e373f2a869cb2777124adb1f66eb1673d6b