Hello community,

here is the log from the commit of package osinfo-db for openSUSE:Factory 
checked in at 2018-04-07 20:48:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osinfo-db (Old)
 and      /work/SRC/openSUSE:Factory/.osinfo-db.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "osinfo-db"

Sat Apr  7 20:48:54 2018 rev:11 rq:593843 version:20180311

Changes:
--------
--- /work/SRC/openSUSE:Factory/osinfo-db/osinfo-db.changes      2018-03-30 
12:00:47.756111128 +0200
+++ /work/SRC/openSUSE:Factory/.osinfo-db.new/osinfo-db.changes 2018-04-07 
20:49:02.707789315 +0200
@@ -1,0 +2,8 @@
+Wed Apr  4 22:15:01 UTC 2018 - l...@suse.com
+
+- bsc#974580 - modify volume id for some windows iso files 
+  First, use "X64FREE?" instead of "X64FRE". 
+  Second, add "IR1_SSS_X64FREV_EN-US_DV5".
+  modify-volume-id-for-windows.patch
+
+-------------------------------------------------------------------

New:
----
  modify-volume-id-for-windows.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ osinfo-db.spec ++++++
--- /var/tmp/diff_new_pack.Onqa8j/_old  2018-04-07 20:49:03.927745163 +0200
+++ /var/tmp/diff_new_pack.Onqa8j/_new  2018-04-07 20:49:03.931745018 +0200
@@ -29,6 +29,7 @@
 Patch21:        add-opensuse-leap-15-support.patch
 Patch22:        add-sle15-support.patch
 Patch23:        add-oes-support.patch
+Patch24:        modify-volume-id-for-windows.patch
 BuildRequires:  intltool
 BuildRequires:  osinfo-db-tools
 
@@ -43,6 +44,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 cd %{_builddir}

++++++ modify-volume-id-for-windows.patch ++++++
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-10.xml 
osinfo-db-20180311/os/microsoft.com/win-10.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-10.xml  2018-04-04 
17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-10.xml      2018-04-04 
17:40:50.358930629 -0400
@@ -68,7 +68,7 @@
     <media arch="x86_64">
       <variant id="education"/>
       <iso>
-        <volume-id>(J_)?CEDN?A_X64FRE_</volume-id>
+        <volume-id>(J_)?CEDN?A_X64FREE?_</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>
@@ -120,7 +120,7 @@
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(J_)?(CCSN?A|CCOMA)_X64FRE_</volume-id>
+        <volume-id>(J_)?(CCSN?A|CCOMA)_X64FREE?_</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>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k12r2.xml 
osinfo-db-20180311/os/microsoft.com/win-2k12r2.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-2k12r2.xml      2018-04-04 
17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-2k12r2.xml  2018-04-04 
17:48:15.943930299 -0400
@@ -68,7 +68,7 @@
 
     <media arch="x86_64">
       <iso>
-        
<volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
+        
<volume-id>(IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -76,7 +76,7 @@
     <media arch="x86_64">
       <variant id="essentials"/>
       <iso>
-        
<volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
+        
<volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -84,7 +84,7 @@
     <media arch="x86_64">
       <variant id="hyperv"/>
       <iso>
-        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
+        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -92,7 +92,7 @@
     <media arch="x86_64">
       <variant id="volume-licence"/>
       <iso>
-        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
+        
<volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k12.xml 
osinfo-db-20180311/os/microsoft.com/win-2k12.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-2k12.xml        2018-04-04 
17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-2k12.xml    2018-04-04 
17:41:43.167048199 -0400
@@ -68,7 +68,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
+        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -77,7 +77,7 @@
     <media arch="x86_64">
       <variant id="essentials"/>
       <iso>
-        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
+        <volume-id>(HRM_SSSO_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -85,7 +85,7 @@
     <media arch="x86_64">
       <variant id="hyperv"/>
       <iso>
-        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
+        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k16.xml 
osinfo-db-20180311/os/microsoft.com/win-2k16.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-2k16.xml        2018-04-04 
17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-2k16.xml    2018-04-04 
17:39:19.718809457 -0400
@@ -28,7 +28,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>^(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_</volume-id>
+        <volume-id>^(SSS_X64CHK|SSS_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -36,7 +36,7 @@
     <media arch="x86_64">
       <variant id="essentials"/>
       <iso>
-        <volume-id>^(SESS_X64FRE)_</volume-id>
+        <volume-id>^(SESS_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -44,7 +44,7 @@
     <media arch="x86_64">
       <variant id="hyperv"/>
       <iso>
-        <volume-id>^(SHV_X64CHK|SHV_X64FRE)_</volume-id>
+        <volume-id>^(SHV_X64CHK|SHV_X64FREE?)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" 
l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-8.1.xml 
osinfo-db-20180311/os/microsoft.com/win-8.1.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-8.1.xml 2018-04-04 
17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-8.1.xml     2018-04-04 
17:39:44.510843045 -0400
@@ -148,7 +148,7 @@
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(IR[M35]_CCSN?A_X64FRE)_</volume-id>
+        <volume-id>(IR[M35]_CCSN?A_X64FREE?)_</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>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-8.xml 
osinfo-db-20180311/os/microsoft.com/win-8.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-8.xml   2018-04-04 
17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-8.xml       2018-04-04 
17:42:28.079156558 -0400
@@ -78,7 +78,7 @@
     </media>
     <media installer-reboots="2" arch="x86_64">
       <iso>
-        <volume-id>(HB1_CCPA_X64FRE|HRM_CCSN?A_X64FRE)_</volume-id>
+        <volume-id>(HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_</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>

Reply via email to