Add support for the flashed firmware provide kind

This allows us to have an ID that isn't tied to the GUID, and also allows us to
have one component that targets more than one ESRT GUID. This requires changing
the matching logic better, but should match what makes it into AppStream 0.9

5 files changed, 12 insertions, 8 deletions

diff --git a/data/tests/firmware/2_0_0/firmware.inf b/data/tests/firmware/2_0_0/firmware.inf
index ce4eeef..5c38614 100644
--- a/data/tests/firmware/2_0_0/firmware.inf
+++ b/data/tests/firmware/2_0_0/firmware.inf
@@ -4,6 +4,8 @@
 Class=Firmware
 ClassGuid={f2e7dd72-6468-4e36-b6f1-6488f42c1b52}
 DriverVer=03/01/2015,2.0.0
+Provider=%Provider%
+AppstreamId=com.hughski.ColorHug2.firmware
 
 [Firmware_CopyFiles]
 firmware.bin
@@ -14,7 +16,6 @@ HKR,,FirmwareVersion,%REG_DWORD%,0x0000000
 HKR,,FirmwareFilename,,firmware.bin
 
 [Strings]
-Provider     = "Hughski"
-MfgName      = "Hughski Limited"
+Provider     = "Hughski Limited"
 FirmwareDesc = "ColorHug Firmware"
 DiskName     = "Firmware for the ColorHug Colorimeter"
diff --git a/data/tests/firmware/2_0_1/firmware.inf b/data/tests/firmware/2_0_1/firmware.inf
index ca6ca8b..f9ce8f4 100644
--- a/data/tests/firmware/2_0_1/firmware.inf
+++ b/data/tests/firmware/2_0_1/firmware.inf
@@ -3,6 +3,7 @@
 [Version]
 Class=Firmware
 ClassGuid={f2e7dd72-6468-4e36-b6f1-6488f42c1b52}
+Provider=%Provider%
 
 [Firmware_CopyFiles]
 firmware.bin
@@ -13,7 +14,6 @@ HKR,,FirmwareVersion,%REG_DWORD%,0x0000000
 HKR,,FirmwareFilename,,firmware.bin
 
 [Strings]
-Provider     = "Hughski"
-MfgName      = "Hughski Limited"
+Provider      = "Hughski Limited"
 FirmwareDesc = "ColorHug Firmware"
 DiskName     = "Firmware for the ColorHug Colorimeter"
diff --git a/data/tests/firmware/2_0_1/firmware.metainfo.xml b/data/tests/firmware/2_0_1/firmware.metainfo.xml
index ba448b6..7097762 100644
--- a/data/tests/firmware/2_0_1/firmware.metainfo.xml
+++ b/data/tests/firmware/2_0_1/firmware.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2015 Richard Hughes <richard@hughsie.com> -->
 <component type="firmware">
-  <id>84f40464-9272-4ef7-9399-cd95f12da696</id>
+  <id>com.hughski.ColorHug2.firmware</id>
   <name>ColorHug Firmware</name>
   <summary>Firmware for the ColorHug Colorimeter</summary>
   <description>
diff --git a/data/tests/firmware/2_0_2/firmware.inf b/data/tests/firmware/2_0_2/firmware.inf
index fe604b7..28a21b5 100644
--- a/data/tests/firmware/2_0_2/firmware.inf
+++ b/data/tests/firmware/2_0_2/firmware.inf
@@ -4,6 +4,7 @@
 Class=Firmware
 ClassGuid={f2e7dd72-6468-4e36-b6f1-6488f42c1b52}
 DriverVer=03/03/2015,2.0.2
+Provider=%Provider%
 
 [Firmware_CopyFiles]
 firmware.bin
@@ -14,7 +15,6 @@ HKR,,FirmwareVersion,%REG_DWORD%,0x0000000
 HKR,,FirmwareFilename,,firmware.bin
 
 [Strings]
-Provider     = "Hughski"
-MfgName      = "Hughski Limited"
+Provider     = "Hughski Limited"
 FirmwareDesc = "ColorHug Firmware"
 DiskName     = "Firmware for the ColorHug Colorimeter"
diff --git a/data/tests/firmware/2_0_2/firmware.metainfo.xml b/data/tests/firmware/2_0_2/firmware.metainfo.xml
index 91f2941..c459bd2 100644
--- a/data/tests/firmware/2_0_2/firmware.metainfo.xml
+++ b/data/tests/firmware/2_0_2/firmware.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2015 Richard Hughes <richard@hughsie.com> -->
 <component type="firmware">
-  <id>84f40464-9272-4ef7-9399-cd95f12da696</id>
+  <id>com.hughski.ColorHug2.firmware</id>
   <name>ColorHug Firmware</name>
   <summary>Firmware for the ColorHug Colorimeter</summary>
   <description>
@@ -10,6 +10,9 @@
       adds new features.
     </p>
   </description>
+  <provides>
+    <firmware type="flashed">84f40464-9272-4ef7-9399-cd95f12da696</firmware>
+  </provides>
   <url type="homepage">http://www.hughski.com/</url>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>