[Libosinfo] [PATCH v5 09/14] win8.1: Clean up vol-id entries

[Fabiano Fidêncio]

From: Fabiano Fidêncio <fabiano at fidencio.org>

- IR[M135]_CEN?NA_X*FRE is already covered by Enterprise Volume ids.
- IR[M3]_CCSN?A_X*FRE is now covered by No Variant Volume ids.
- IR[M15]_CPRN?A_X*FREV is now covered by Professional Volume Ids.

Signed-off-by: Fabiano Fidêncio <fabiano at fidencio.org>
---
 data/os/microsoft.com/win-8.1.xml.in | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index 1b4e64a..a68c788 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -67,7 +67,7 @@
     <media arch="i686">
       <variant id="professional"/>
       <iso>
-        <volume-id>(IR[15]_CPRN?A_X86FREV)_</volume-id>
+        <volume-id>(IR[M15]_CPRN?A_X86FREV)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
@@ -75,7 +75,7 @@
     <media arch="x86_64">
       <variant id="professional"/>
       <iso>
-        <volume-id>(IR[15]_CPRN?A_X64FREV|)_</volume-id>
+        <volume-id>(IR[M15]_CPRN?A_X64FREV)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
@@ -85,7 +85,7 @@
     <media arch="i686">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(IR[135]_CENN?A_X86FREV)_</volume-id>
+        <volume-id>(IR[M135]_CENN?A_X86FREV)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
@@ -93,7 +93,7 @@
     <media arch="x86_64">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(IR[135]_CENN?A_X64FREV)_</volume-id>
+        <volume-id>(IR[M135]_CENN?A_X64FREV)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
@@ -102,30 +102,14 @@
     <!-- No variant -->
     <media arch="i686">
       <iso>
-        <volume-id>(IR5_CCSNA_X86FRE)_</volume-id>
+        <volume-id>(IR[M35]_CCSN?A_X86FRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(IR5_CCSN?A_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Variant unknown -->
-    <media arch="i686">
-      <iso>
-        <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE|IR3_CENA_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_</volume-id>
+        <volume-id>(IR[M35]_CCSN?A_X64FRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
-- 
2.7.3