commit 856585920745ba4b354dd18d05b32625784b1feb
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jan 28 22:05:55 2019 +0000
Update VBox to 6.0.4
.gitignore | 1 +
VirtualBox-remove-volatile-asm.patch | 18 ------------------
VirtualBox.spec | 9 +++++----
sources | 4 ++--
update_vbox.sh | 5 +++--
5 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d8a2d0..75232ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-6.0.0.tar.bz2
/UserManual.pdf
/VirtualBox-6.0.2.tar.bz2
+/VirtualBox-6.0.4.tar.bz2
diff --git a/VirtualBox.spec b/VirtualBox.spec
index b2801b0..858a8c2 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -33,8 +33,8 @@
%endif
Name: VirtualBox
-Version: 6.0.2
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Version: 6.0.4
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -75,7 +75,6 @@ Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
Patch60: VirtualBox-5.2.10-xclient.patch
Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
-Patch65: VirtualBox-remove-volatile-asm.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -300,7 +299,6 @@ rm -r src/libs/zlib-1.2.8/
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
%patch61 -p1 -b .automount
-%patch65 -p1 -b .asm
%build
./configure --disable-kmods \
@@ -806,6 +804,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Mon Jan 28 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-1
+- Update VBox to 6.0.4
+
* Wed Jan 23 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.2-3
- python3 on epel7
- Fix build of webservice
diff --git a/sources b/sources
index 6ef4b20..0f58cce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cfc7b63454d24e3fab1fc8aa60dacbc2 VirtualBox-6.0.2.tar.bz2
-21094b25d37ade2a76197a37bc0a73c1 UserManual.pdf
+96e53b9e75a37cc6fd2d13d9c9f6881d VirtualBox-6.0.4.tar.bz2
+cc249f95c62a734b011ce0043fe7180d UserManual.pdf
diff --git a/update_vbox.sh b/update_vbox.sh
index 1fe3794..8b9a1ea 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=5.2.22
+VERSION=6.0.4
REL=1
RAWHIDE=30
if [ -z "$1" ]
@@ -13,6 +13,7 @@ then
echo STAGE 0
git pull
rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec
+rm UserManual.pdf
spectool -g VirtualBox.spec
rfpkg srpm && copr-cli build sergiomb/vboxfor23
VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm
echo Press enter to continue; read dummy;
@@ -21,7 +22,7 @@ fi
if test $stage -le 1
then
echo STAGE 1
-rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2
+rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf
rfpkg ci -c && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait