From 179a83b02a01769836473b59f03c887e1070a4c8 Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
Date: Tue, 10 Sep 2013 04:40:51 +0300
Subject: [PATCH] fedora,win7: Improve & add data

---
 data/oses/fedora.xml.in                            | 89 ++++++++++++++++++++--
 data/oses/windows.xml.in                           |  2 +-
 ..._enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng |  2 +
 ..._enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt | 29 +++++++
 4 files changed, 115 insertions(+), 7 deletions(-)
 create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
 create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt

diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
index ae4256d..e5456fe 100644
--- a/data/oses/fedora.xml.in
+++ b/data/oses/fedora.xml.in
@@ -1445,14 +1445,91 @@
     <resources arch="all">
       <minimum>
         <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
       </minimum>
+    </resources>
 
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/20">
+    <short-id>fedora20</short-id>
+    <_name>Fedora 20</_name>
+    <version>20</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Heisenbug</codename>
+    <upgrades id="http://fedoraproject.org/fedora/19"/>
+    <derives-from id="http://fedoraproject.org/fedora/19"/>
+
+    <media arch="i686">
+      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url> -->
+      <iso>
+        <volume-id>Fedora 20.* i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url> -->
+      <iso>
+        <volume-id>Fedora 20.* x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-Desktop-i686-20-1.iso</url> -->
+      <iso>
+        <volume-id>Fedora-Live-.*-i686-20</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso</url> -->
+      <iso>
+        <volume-id>Fedora-Live-.*-x86_64-20</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/os/</url> -->
+      <treeinfo>
+        <family>Fedora</family>
+        <version>20</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/os/</url> -->
+      <treeinfo>
+        <family>Fedora</family>
+        <version>20</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
     </resources>
 
     <installer>
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 26d4410..002227b 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -745,7 +745,7 @@
     </media>
     <media arch="x86_64" installer-reboots="2">
       <iso>
-        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
+        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL|GSP1RMCNENXVOL)_</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 --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
new file mode 100644
index 0000000..e46008a
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
@@ -0,0 +1,2 @@
+[general]
+l10n-language=en_US
diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
new file mode 100644
index 0000000..9f8097c
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCNENXVOL_EN_DVD
+Volume set id: GSP1RMCNENXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1049368
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
-- 
1.8.4.2