From 386c9c4d123145f71608192072f4099f458c437c Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Mar 07 2019 02:35:00 +0000
Subject: Update Virtualbox Guest Additions to 6.0.4


---

diff --git a/.gitignore b/.gitignore
index 25fc209..3697998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /VirtualBox-5.2.22.tar.bz2
 /VirtualBox-6.0.0.tar.bz2
 /VirtualBox-6.0.2.tar.bz2
+/VirtualBox-6.0.4.tar.bz2
diff --git a/VirtualBox-6.0.0-fix-build.patch b/VirtualBox-6.0.0-fix-build.patch
deleted file mode 100644
index 1d79800..0000000
--- a/VirtualBox-6.0.0-fix-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semevent-linux.cpp
-===================================================================
---- VirtualBox-6.0.0.orig/src/VBox/Runtime/r3/linux/semevent-linux.cpp
-+++ VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semevent-linux.cpp
-@@ -37,7 +37,9 @@
-  * against glibc < 2.6.
-  */
- #include "../posix/semevent-posix.cpp"
--asm volatile (".global epoll_pwait");
-+/* Fedora is guaranteed to ship glibc > 2.6
-+ *  asm volatile (".global epoll_pwait");
-+ */
- 
- #else /* glibc < 2.6 */
- 
-Index: VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
-===================================================================
---- VirtualBox-6.0.0.orig/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
-+++ VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
-@@ -39,7 +39,9 @@
-  * against glibc < 2.6.
-  */
- #include "../posix/semeventmulti-posix.cpp"
--asm volatile (".global epoll_pwait");
-+/* Fedora is guaranteed to ship glibc > 2.6
-+ *  asm volatile (".global epoll_pwait");
-+ */
- 
- #else /* glibc < 2.6 */
- 
diff --git a/sources b/sources
index b7f5c89..e96d9c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.0.2.tar.bz2) = 9cfc03eae073ada47c050d2a5eeefa6f724ad2094f2bc3717aa010553ab0dd5af0ed0860bf120727491c7798cdff9219e53cdc3d629f61e3cd12c55068e7401b
+SHA512 (VirtualBox-6.0.4.tar.bz2) = c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
diff --git a/update_vbox.sh b/update_vbox.sh
index f8fef83..8d8e7e8 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,9 +1,9 @@
-VERSION=5.2.22
+VERSION=6.0.4
 REL=1
-RAWHIDE=30
+RAWHIDE=31
 
 git pull
-rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to $VERSION, bugfix version" virtualbox-guest-additions.spec
+rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to $VERSION" virtualbox-guest-additions.spec
 spectool -g virtualbox-guest-additions.spec
 fedpkg new-sources ./VirtualBox-$VERSION.tar.bz2
 fedpkg srpm && copr-cli build sergiomb/vboxfor23 virtualbox-guest-additions-$VERSION-$REL.fc$RAWHIDE.src.rpm
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 8937f59..1eccc7f 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,8 +1,8 @@
 %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
 
 Name:       virtualbox-guest-additions
-Version:    6.0.2
-Release:    2%{?dist}
+Version:    6.0.4
+Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -21,8 +21,6 @@ Patch3:     VirtualBox-5.2.10-xclient.patch
 #Patch4:     VirtualBox-5.2.6-gcc8.patch
 # From Archlinux
 Patch10:    010-linux-4.16-mount-fixes.patch
-# To fix build with Fedora 30.
-Patch11:    VirtualBox-6.0.0-fix-build.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  kBuild >= 0.1.9998.r3093
@@ -198,6 +196,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Thu Mar 07 2019 Sérgio Basto <sergio@serjux.com> - 6.0.4-1
+- Update Virtualbox Guest Additions to 6.0.4
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild