Tighten subpackage dependencies

... so that we can be sure they get updated in lockstep with fwupd.

.gitignore

@@ -3,3 +3,12 @@
 /fwupd-0.1.2.tar.xz
 /fwupd-0.1.3.tar.xz
 /fwupd-0.1.4.tar.xz
+/fwupd-0.1.5.tar.xz
+/fwupd-0.1.6.tar.xz
+/fwupd-0.5.0.tar.xz
+/fwupd-0.5.1.tar.xz
+/fwupd-0.5.2.tar.xz
+/fwupd-0.5.3.tar.xz
+/fwupd-0.5.4.tar.xz
+/fwupd-0.7.1.tar.xz
+/fwupd-0.7.2.tar.xz

fwupd.spec

@@ -1,60 +1,79 @@
+%global libglib2_version 2.45.8
+%global libappstream_version 0.5.10
+%global libgusb_version 0.2.9
+%global libsoup_version 2.51.92
+
 Summary:   Firmware update daemon
 Name:      fwupd
-Version:   0.1.4
-Release:   1%{?dist}
+Version:   0.7.2
+Release:   2%{?dist}
 License:   GPLv2+
 URL:       https://github.com/hughsie/fwupd
 Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
 
 BuildRequires: docbook-utils
 BuildRequires: gettext
-BuildRequires: glib2-devel
+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: polkit-devel >= 0.103
 BuildRequires: libgcab1-devel
 BuildRequires: sqlite-devel
 BuildRequires: gpgme-devel
 BuildRequires: systemd
-BuildRequires: libsoup-devel
+BuildRequires: libarchive-devel
 BuildRequires: gobject-introspection-devel
-BuildRequires: libappstream-glib-devel >= 0.3.6
+BuildRequires: gcab
+BuildRequires: valgrind
 
 %ifarch x86_64 %{ix86} aarch64
-BuildRequires: fwupdate-devel >= 0.4
+BuildRequires: fwupdate-devel >= 0.5
 %endif
 
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
+Requires: libdfu%{?_isa} = %{version}-%{release}
+Requires: glib2%{?_isa} >= %{glib2_version}
+Requires: libappstream-glib%{?_isa} >= %{libappstream_version}
+Requires: libgusb%{?_isa} >= %{libgusb_version}
+Requires: libsoup%{?_isa} >= %{libsoup_version}
+
+Obsoletes: fwupd-sign < 0.1.6
+
 %description
 fwupd is a daemon to allow session software to update device firmware.
 
 %package devel
 Summary: Development package for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Files for development with %{name}.
 
-%package sign
-Summary: Firmware signing server
-Requires: %{name} = %{version}-%{release}
+%package -n libdfu
+Summary: A library for DFU
 
-%description sign
-This package provides a signing server suitable for automatically signing
-firmware in .cab archives.
-The values in /etc/fwsignd.conf file should be set before starting the daemon.
-You probably don't need this package unless you're implementing a LVFS clone.
+%description -n libdfu
+A library for updating USB devices using DFU.
+
+%package -n libdfu-devel
+Summary: Development package for libdfu
+Requires: libdfu%{?_isa} = %{version}-%{release}
+
+%description -n libdfu-devel
+Files for development with libdfu.
 
 %prep
 %setup -q
 
 %build
 %configure \
-        --enable-fwsignd        \
         --disable-static        \
 %ifnarch x86_64 %{ix86} aarch64
         --disable-uefi          \
@@ -71,11 +90,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %find_lang %{name}
 
-%pre sign
-getent group fwsignd >/dev/null || groupadd -r fwsignd
-getent passwd fwsignd >/dev/null || \
-    useradd -r -g fwsignd -d /var/lib/fwsignd -s /sbin/nologin \
-    -c "User for fwsignd" fwsignd
+%check
+make check VERBOSE=1
 
 %post
 /sbin/ldconfig
@@ -91,11 +107,14 @@ getent passwd fwsignd >/dev/null || \
 %files -f %{name}.lang
 %doc README.md AUTHORS NEWS
 %license COPYING
-%{_libexecdir}/fwupd
+%config(noreplace)%{_sysconfdir}/fwupd.conf
+%dir %{_libexecdir}/fwupd
+%{_libexecdir}/fwupd/fwupd
 %{_bindir}/fwupdmgr
 %{_sysconfdir}/pki/fwupd
 %{_sysconfdir}/pki/fwupd-metadata
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.fwupd.conf
+%{_datadir}/app-info/xmls/org.freedesktop.fwupd.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
 %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
 %{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
@@ -103,28 +122,111 @@ getent passwd fwsignd >/dev/null || \
 %{_datadir}/man/man1/fwupdmgr.1.gz
 %{_unitdir}/fwupd-offline-update.service
 %{_unitdir}/fwupd.service
-%{_unitdir}/system-update.target.wants/*.service
+%{_unitdir}/system-update.target.wants/
 %dir %{_localstatedir}/lib/fwupd
-%{_libdir}/lib*.so.*
-%{_libdir}/girepository-1.0/*.typelib
+%{_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
-
-%files sign
-%config(noreplace)%{_sysconfdir}/fwsignd.conf
-%{_unitdir}/fwsignd.service
-%{_libexecdir}/fwsignd
-%attr(755,fwsignd,fwsignd) %dir %{_localstatedir}/lib/fwsignd
+%dir %{_libdir}/fwupd-plugins-1
+%{_libdir}/fwupd-plugins-1/*.so
 
 %files devel
+%{_datadir}/gir-1.0/Fwupd-1.0.gir
+%{_datadir}/gtk-doc/html/libfwupd
 %{_includedir}/fwupd-1
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/gir-1.0/*.gir
+%{_libdir}/libfwupd*.so
+%{_libdir}/pkgconfig/fwupd.pc
+
+%files -n libdfu
+%{_bindir}/dfu-tool
+%{_datadir}/man/man1/dfu-tool.1.gz
+%{_libdir}/girepository-1.0/Dfu-1.0.typelib
+%{_libdir}/libdfu*.so.*
+
+%files -n libdfu-devel
+%{_datadir}/gir-1.0/Dfu-1.0.gir
+%{_datadir}/gtk-doc/html/libdfu
+%dir %{_includedir}/libdfu
+%{_includedir}/dfu.h
+%{_includedir}/libdfu/*.h
+%{_libdir}/libdfu*.so
+%{_libdir}/pkgconfig/dfu.pc
 
 %changelog
+* Thu Jul 14 2016 Kalev Lember <klember@redhat.com> - 0.7.2-2
+- Tighten subpackage dependencies
+
+* Mon Jun 13 2016 Richard Hughes <richard@hughsie.com> 0.7.2-1
+- New upstream release
+- Allow devices to have multiple assigned GUIDs
+- Allow metainfo files to match only specific revisions of devices
+- Only claim the DFU interface when required
+- Only return updatable devices from GetDevices()
+- Show the DFU protocol version in 'dfu-tool list'
+
+* Fri May 13 2016 Richard Hughes <richard@hughsie.com> 0.7.1-1
+- New upstream release
+- Add device-added, device-removed and device-changed signals
+- Add for a new device field "Flashes Left"
+- Fix a critical warning when restarting the daemon
+- Fix BE issues when reading and writing DFU files
+- Make the device display name nicer
+- Match the AppStream metadata after a device has been added
+- Return all update descriptions newer than the installed version
+- Set the device description when parsing local firmware files
+
+* Wed Nov 18 2015 Richard Hughes <richard@hughsie.com> 0.5.4-1
+- New upstream release
+- Use API available in fwupdate 0.5 to avoid writing temp files
+- Fix compile error against fwupdate 0.5 due to API bump
+
+* Thu Nov 05 2015 Richard Hughes <richard@hughsie.com> 0.5.3-1
+- New upstream release
+- Avoid seeking when reading the file magic during refresh
+- Do not assume that the compressed XML data will be NUL terminated
+- Use the correct user agent string for fwupdmgr
+
+* Wed Oct 28 2015 Richard Hughes <richard@hughsie.com> 0.5.2-1
+- New upstream release
+- Add the update description to the GetDetails results
+- Clear the in-memory firmware store only after parsing a valid XML file
+- Ensure D-Bus remote errors are registered at fwupdmgr startup
+- Fix verify-update to produce components with the correct provide values
+- Show the dotted-decimal representation of the UEFI version number
+- Support cabinet archives files with more than one firmware
+
+* Mon Sep 21 2015 Richard Hughes <richard@hughsie.com> 0.5.1-1
+- Update to 0.5.1 to fix a bug in the offline updater
+
+* Tue Sep 15 2015 Richard Hughes <richard@hughsie.com> 0.5.0-1
+- New upstream release
+- Do not reboot if racing with the PackageKit offline update mechanism
+
+* Thu Sep 10 2015 Kalev Lember <klember@redhat.com> 0.1.6-2
+- Own system-update.target.wants directory
+- Make fwupd-sign obsoletes versioned
+
+* Thu Sep 10 2015 Richard Hughes <richard@hughsie.com> 0.1.6-1
+- New upstream release
+- Add application metadata when getting the updates list
+- Remove fwsignd, we have the LVFS now
+
+* Fri Aug 21 2015 Kalev Lember <klember@redhat.com> 0.1.5-3
+- Disable fwupd offline update service
+
+* Wed Aug 19 2015 Richard Hughes <richard@hughsie.com> 0.1.5-2
+- Use the non-beta download URL prefix
+
+* Wed Aug 12 2015 Richard Hughes <richard@hughsie.com> 0.1.5-1
+- New upstream release
+- Add a Raspberry Pi firmware provider
+- Fix validation of written firmware
+- Make parsing the option ROM runtime optional
+- Use the AppStream 0.9 firmware specification by default
+
 * Sat Jul 25 2015 Richard Hughes <richard@hughsie.com> 0.1.4-1
 - New upstream release
 - Actually parse the complete PCI option ROM

sources

@@ -1 +1 @@
-84d0e0f0275428209c37f3073a8c8f5f  fwupd-0.1.4.tar.xz
+e5747d009b70d4e00cc55862e5a0bfe6  fwupd-0.7.2.tar.xz