[gnome-boxes] fedora: Remove broken F16 workaround

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 84b7dd09d8818b9720e6b0d3cb2ff3d2724728cb
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Thu Aug 16 18:21:13 2012 +0200

    fedora: Remove broken F16 workaround
    
    Christophe: The changes introduced by 169a4f were not only dubious, they
    were also untested and thus broken. According to my testing, the QXL
    driver will be installed by default on f16 automatic installations,
    even with the changes from commit 169a4f, while the purpose of this
    commit was to avoid installing the QXL driver on these systems.
    
    Zeeshan: Let's remove this non-working code since by the time 3.6 is out
    F16 will be even less relavent than it is already (F18 is out soon). If
    someone uses F16, they just have to opt in to upgrade their system
    immediately after installation.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681970

 data/fedora.ks            |    4 +++-
 src/fedora-installer.vala |   11 +----------
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/data/fedora.ks b/data/fedora.ks
index dafdc66..1aa3359 100644
--- a/data/fedora.ks
+++ b/data/fedora.ks
@@ -31,7 +31,9 @@ reboot
 @graphical-internet
 @sound-and-video
 
-BOXES_FEDORA_SPICE_PACKAGES
+# QXL video driver and SPICE vdagent
+xorg-x11-drv-qxl
+spice-vdagent
 
 %end
 
diff --git a/src/fedora-installer.vala b/src/fedora-installer.vala
index 0fa0662..56b3b67 100644
--- a/src/fedora-installer.vala
+++ b/src/fedora-installer.vala
@@ -12,15 +12,10 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
 
     private string kbd;
 
-    // F16 ships buggly QXL package and spice-vdagent package so simply not install those on F16 and older
-    private bool install_spice_goodies { get { return uint64.parse (os.version) >= 17; } }
-
-    private static Regex spice_packages_regex;
     private static Regex kbd_regex;
 
     static construct {
         try {
-            spice_packages_regex = new Regex ("BOXES_FEDORA_SPICE_PACKAGES");
             kbd_regex = new Regex ("BOXES_FEDORA_KBD");
         } catch (RegexError error) {
             // This just can't fail
@@ -76,11 +71,7 @@ private class Boxes.FedoraInstaller: UnattendedInstaller {
     protected override string fill_unattended_data (string data) throws RegexError {
         var str = base.fill_unattended_data (data);
 
-        str = kbd_regex.replace (str, str.length, 0, kbd);
-
-        var spice_packages = (install_spice_goodies) ? "xorg-x11-drv-qxl\nspice-vdagent" : "";
-
-        return spice_packages_regex.replace (str, str.length, 0, spice_packages);
+        return kbd_regex.replace (str, str.length, 0, kbd);
     }
 
     private async void normal_clean_up (Cancellable? cancellable) throws GLib.Error {