From f953109ba24458303fefbda70031066d15b36106 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Feb 22 2020 18:21:17 +0000
Subject: Update Virtualbox Guest Additions to 6.1.4


---

diff --git a/.gitignore b/.gitignore
index c5d0495..abe2dc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /VirtualBox-6.0.14.tar.bz2
 /VirtualBox-6.1.0.tar.bz2
 /VirtualBox-6.1.2.tar.bz2
+/VirtualBox-6.1.4.tar.bz2
diff --git a/sources b/sources
index 27b73f6..fa4d84e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.1.2.tar.bz2) = 476dedd9dd7a213bd70920f4cdf594b5336555f31e5becb15b5c01d88fa7bed917258831af31600514362384401fd7040cb748a7c76896e4a027bef05026b585
+SHA512 (VirtualBox-6.1.4.tar.bz2) = 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167
diff --git a/update_vbox.sh b/update_vbox.sh
index c076e40..8bd2916 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.2
+VERSION=6.1.4
 REL=1
-RAWHIDE=32
-BRANCHES="f31 f30"
+RAWHIDE=33
+BRANCHES="f32 f31 f30"
 
 git checkout master
 git pull
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 87a81ef..860069d 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.1.2
-Release:    2%{?dist}
+Version:    6.1.4
+Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -47,14 +47,8 @@ BuildRequires: systemd
 # Obsoletes/provides for upgrade path from the rpmfusion guest-additions pkg
 Obsoletes:      VirtualBox-guest-additions < %{version}-%{release}
 Provides:       VirtualBox-guest-additions = %{version}-%{release}
-Provides:       VirtualBox-kmod-common = %{version}-%{release}
-# Virtual Box guests are always x86, no need to build for other archs
+# VirtualBox guests are always x86, no need to build for other archs
 ExclusiveArch:  i686 x86_64
-# Hack to solve problem described in
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4980#c8
-# we conflict with next (bigger, not equal or bigger) version of VirtualBox
-# to force installation of same version VirtualBox-kmodsrc and virtualBox-guest-additions
-Conflicts:      VirtualBox-server > %{version}
 
 %description
 VirtualBox is a powerful x86 and AMD64/Intel64 virtualization product for
@@ -67,6 +61,8 @@ with the Host, including file sharing, clipboard sharing and Seamless mode.
 %autosetup -p1 -n VirtualBox-%{version}
 # Remove prebuilt binaries
 find -name '*.py[co]' -delete
+rm -r src/VBox/Additions/WINNT
+rm -r src/VBox/Additions/os2
 rm -r kBuild/
 rm -r tools/
 # Remove bundle X11 sources and some lib sources
@@ -76,8 +72,6 @@ rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
 rm -r src/libs/libxml2-2.9.*/
 rm -r src/libs/libpng-1.6.*/
 rm -r src/libs/zlib-1.2.*/
-# CRLF->LF
-sed -i 's/\r//' COPYING
 
 
 %build
@@ -170,6 +164,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Sat Feb 22 2020 Sérgio Basto <sergio@serjux.com> - 6.1.4-1
+- Update Virtualbox Guest Additions to 6.1.4
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild