From 541ba67daf20d34e6a89639014512a8818167c8f Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@di.uminho.pt>
Date: Sat, 14 Sep 2013 02:18:04 +0100
Subject: [PATCH 1/4] Fedora: support the -v option (OVS)

---
 util/install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/util/install.sh b/util/install.sh
index d7921e6..0c2016c 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -304,6 +304,12 @@ function wireshark {
 function ovs {
     echo "Installing Open vSwitch..."
 
+    if [ "$DIST" = "Fedora" ]; then
+        # Just install Fedora's openvswitch RPMS
+        $install openvswitch openvswitch-controller
+        return
+    fi
+
     OVS_SRC=$BUILD_DIR/openvswitch
     OVS_BUILD=$OVS_SRC/build-$KERNEL_NAME
     OVS_KMODS=($OVS_BUILD/datapath/linux/{openvswitch_mod.ko,brcompat_mod.ko})

From de2680152bd99d347492fd767379c31272481f6f Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@di.uminho.pt>
Date: Sat, 14 Sep 2013 02:19:39 +0100
Subject: [PATCH 2/4] Fedora: support the -w option (wireshark)

---
 util/install.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/util/install.sh b/util/install.sh
index 0c2016c..c5c3d77 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -261,6 +261,14 @@ function wireshark_version_check {
 function wireshark {
     echo "Installing Wireshark dissector..."
 
+    if [ "$DIST" = "Fedora" ]; then
+        # Just install Fedora's wireshark RPMS
+        # Fedora's wirehark >= 1.10.2-2 includes an OF dissector
+        # (it has been backported from the future Wireshark 1.12 code base)
+        $install wireshark wireshark-gnome
+        return
+    fi
+
     sudo apt-get install -y wireshark tshark libgtk2.0-dev
 
     if [ "$DIST" = "Ubuntu" ] && [ "$RELEASE" != "10.04" ]; then

From 40ad3a1bf9457ddcaf10c8af1e77f90123b92d62 Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@di.uminho.pt>
Date: Sat, 14 Sep 2013 02:21:24 +0100
Subject: [PATCH 3/4] Replaces a couple of 'sudo apt-get install -y' instances
 by '$install'

---
 util/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/install.sh b/util/install.sh
index c5c3d77..fb53869 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -269,12 +269,12 @@ function wireshark {
         return
     fi
 
-    sudo apt-get install -y wireshark tshark libgtk2.0-dev
+    $install wireshark tshark libgtk2.0-dev
 
     if [ "$DIST" = "Ubuntu" ] && [ "$RELEASE" != "10.04" ]; then
         # Install newer version
-        sudo apt-get install -y scons mercurial libglib2.0-dev
-        sudo apt-get install -y libwiretap-dev libwireshark-dev
+        $install scons mercurial libglib2.0-dev
+        $install libwiretap-dev libwireshark-dev
         cd $BUILD_DIR
         hg clone https://bitbucket.org/barnstorm/of-dissector
         if [[ -z "$WS_DISSECTOR_REV" ]]; then

From 0457824193e183cf54b20186b53cbb19d5a1065f Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@di.uminho.pt>
Date: Sat, 14 Sep 2013 02:22:07 +0100
Subject: [PATCH 4/4] Fedora: update status messages

---
 util/install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/util/install.sh b/util/install.sh
index fb53869..42d4b3a 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -652,11 +652,12 @@ function modprobe {
 
 function all {
     if [ "$DIST" = "Fedora" ]; then
-        printf "\nFedora 19 support status:\n"
-        printf "the install script options -b, -f, -n, and -p should work.\n\n"
-        printf "Just try:\n"
-        printf "    install.sh -fnp\n"
-        printf "with Fedora's kernel (3.10) and openvswitch (1.10.0) packages.\n"
+        printf "\nFedora 18+ support (still work in progress):\n"
+        printf " * Fedora 18+ has kernel 3.10 RPMS in the updates repositories\n"
+        printf " * Fedora 18+ has openvswitch 1.10 RPMS in the updates repositories\n"
+        printf " * the install.sh script options [-bfnpvw] should work.\n"
+        printf " * for a basic setup just try:\n"
+        printf "       install.sh -fnpv\n\n"
         exit 3
     fi
     echo "Installing all packages except for -eix (doxypy, ivs, nox-classic)..."