[mixxx/f28] New upstream release 2.1.6
by Uwe Klotz
commit 26710553326fdde69502dab8020f36e2c8698d0d
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Dec 31 09:48:51 2018 +0100
New upstream release 2.1.6
.gitignore | 14 +-------------
mixxx.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac5dffe..7507191 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1 @@
-mixxx-1.11.0-20130517bzr.tar.bz2
-mixxx-1.11.0-src.tar.gz
-/mixxx-2.0.0-src.tar.gz
-/mixxx-22f78d299961a1b3910b80f161391a181b18265a.tar.gz
-/mixxx-f77cf966288ee481fb7f17cc56bed830b7137f54.tar.gz
-/mixxx-66028ddb1a16722285fcc999c2e7170c446b7c03.tar.gz
-/mixxx-release-2.1.0-rc1.tar.gz
-/mixxx-release-2.1.0.tar.gz
-/mixxx-release-2.1.1.tar.gz
-/mixxx-release-2.1.2.0.tar.gz
-/mixxx-release-2.1.3.tar.gz
-/mixxx-release-2.1.4.tar.gz
-/mixxx-release-2.1.5.tar.gz
+/mixxx-release-2.1.6.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 804cce6..2f47b80 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -16,7 +16,7 @@
%endif
Name: mixxx
-Version: 2.1.5
+Version: 2.1.6
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Mon Dec 31 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.6-1
+- New upstream release 2.1.6
+
* Wed Oct 31 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.5-1
- New upstream release 2.1.5
diff --git a/sources b/sources
index a5b22c0..51e0ed4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49e1257c206143640ff4c7aff8fa3d83 mixxx-release-2.1.5.tar.gz
+89e48d8e6bd78a47283f8cc0290f9c70 mixxx-release-2.1.6.tar.gz
5 years, 10 months
[x265/el7: 2/2] Merge branch 'master' into el7
by Leigh Scott
commit 3fffb956c2d1201167f566e0bda02b538c77555f
Merge: d9c20fe 16754e9
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Dec 30 21:55:19 2018 +0000
Merge branch 'master' into el7
x265.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
5 years, 10 months
[x265] Rebuild against newer nasm on el7
by Leigh Scott
commit 16754e9fd877a1b0f53aaf15b6dd8c3b448f520f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Dec 30 21:53:11 2018 +0000
Rebuild against newer nasm on el7
x265.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x265.spec b/x265.spec
index 170d33a..591cb5d 100644
--- a/x265.spec
+++ b/x265.spec
@@ -3,7 +3,7 @@
Summary: H.265/HEVC encoder
Name: x265
Version: 2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -141,6 +141,9 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Sun Dec 30 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.9-3
+- Rebuild against newer nasm on el7 (rfbz #5128)
+
* Wed Nov 21 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.9-2
- Rebuild for ffmpeg-3.* on el7
5 years, 10 months
[VirtualBox-kmod] VirtualBox 6.0
by Sérgio M. Basto
commit ae7a20dcf6908881ab69a5687d47455f30fe76a9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 30 18:12:01 2018 +0000
VirtualBox 6.0
VirtualBox-kmod.spec | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 5a6608c..9bcd65d 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -31,17 +31,17 @@
# major version number, while the kernel module abi is not guaranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel 106108
-%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#global prerel RC1
+%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.2.22
-#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 3%{?dist}
+Version: 6.0.0
+Release: 1%{?prerel:.%{prerel}}%{?dist}
+#Release: 1%%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -51,7 +51,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
Source1: excludekernel-filter.txt
Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip
-Patch1: changeset_75402.diff
+#Patch1: kernel-4.18.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -75,7 +75,7 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-%patch1 -p1 -b .rhel76_fix
+#patch1 -p2 -b .kernel_4.18
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
@@ -140,6 +140,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Dec 19 2018 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-1
+- VirtualBox 6.0
+
* Thu Dec 13 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-3
- Fix vboxvideo.ko build on rhel76
5 years, 10 months
[VirtualBox] git add VirtualBox-6.0.0-noupdate.patch
by Sérgio M. Basto
commit 68e2dc760e3292588ff30dde072aa61bcb2f4089
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 30 15:52:04 2018 +0000
git add VirtualBox-6.0.0-noupdate.patch
VirtualBox-6.0.0-noupdate.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/VirtualBox-6.0.0-noupdate.patch b/VirtualBox-6.0.0-noupdate.patch
new file mode 100644
index 0000000..a5fd467
--- /dev/null
+++ b/VirtualBox-6.0.0-noupdate.patch
@@ -0,0 +1,11 @@
+--- ./src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp.orig 2018-11-25 02:08:51.251845574 +0000
++++ ./src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2018-11-25 02:06:13.964011846 +0000
+@@ -164,7 +164,7 @@ void VBoxUpdateData::decode()
+ if (m_dayList.isEmpty())
+ populate();
+ PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
+- m_enmPeriodIndex = index == PeriodUndefined ? Period1Day : index;
++ m_enmPeriodIndex = index == PeriodUndefined ? PeriodNever : index;
+ }
+
+ /* Parse 'date' value: */
5 years, 10 months
[VirtualBox] VirtualBox 6.0 Patch23 was applied upstream.
by Sérgio M. Basto
commit c40c42287ea5a119a533b80388c734a198d396ed
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 30 12:56:33 2018 +0000
VirtualBox 6.0
Patch23 was applied upstream.
.gitignore | 2 +
...AutoMount-Change-Linux-mount-code-to-use-.patch | 63 +++++++-------
VirtualBox-5.0.18-xserver_guest.patch | 54 ------------
VirtualBox-5.1.0-add-Mageia-support.patch | 99 ++++++++++------------
VirtualBox-OSE-4.1.4-noupdate.patch | 22 -----
VirtualBox.spec | 75 +++++++++-------
sources | 3 +-
7 files changed, 122 insertions(+), 196 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d50a20c..09fb549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-5.2.18.tar.bz2
/VirtualBox-5.2.20.tar.bz2
/VirtualBox-5.2.22.tar.bz2
+/VirtualBox-6.0.0.tar.bz2
+/UserManual.pdf
diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
index 625d554..63447ad 100644
--- a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -10,19 +10,18 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
1 file changed, 8 insertions(+), 54 deletions(-)
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
-index aa15d8b1..551edd4a 100644
---- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
-+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
-@@ -39,6 +39,7 @@
- #include <iprt/assert.h>
+--- ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp.orig 2018-11-25 02:36:31.829306539 +0000
++++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-11-25 02:41:41.632973288 +0000
+@@ -40,6 +40,7 @@
+ #include <iprt/ctype.h>
#include <iprt/dir.h>
#include <iprt/mem.h>
+#include <iprt/param.h>
#include <iprt/path.h>
- #include <iprt/string.h>
#include <iprt/semaphore.h>
-@@ -77,6 +78,9 @@ RT_C_DECLS_END
- # endif
+ #include <iprt/sort.h>
+@@ -117,6 +118,9 @@ RT_C_DECLS_END
+ # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH
#endif
+#ifndef MAX_MNTOPT_STR
@@ -30,31 +29,32 @@ index aa15d8b1..551edd4a 100644
+#endif
/*********************************************************************************************************************************
- * Global Variables *
-@@ -297,13 +301,13 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
- rc = vbsvcAutoMountPrepareMountPoint(pszMountPoint, pszShareName, pOpts);
- if (!fSkip && RT_SUCCESS(rc))
+ * Structures and Typedefs *
+@@ -398,13 +402,13 @@ static int vbsvcAutoMountSharedFolderOld
+ int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
+ if (RT_SUCCESS(rc))
{
--#ifdef RT_OS_SOLARIS
- char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
++ char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
+ RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
-+ pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
-+#ifdef RT_OS_SOLARIS
++ Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
+ # ifdef RT_OS_SOLARIS
int fFlags = 0;
- if (pOpts->ronly)
+ if (Opts.ronly)
fFlags |= MS_RDONLY;
+- char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
- RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
-- pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
+- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
int r = mount(pszShareName,
pszMountPoint,
fFlags | MS_OPTIONSTR,
-@@ -320,32 +324,11 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+@@ -421,34 +425,11 @@ static int vbsvcAutoMountSharedFolderOld
- #elif defined(RT_OS_LINUX)
+ # else /* RT_OS_LINUX */
unsigned long fFlags = MS_NODEV;
-
- /*const char *szOptions = { "rw" }; - ??? */
- struct vbsf_mount_info_new mntinf;
+- RT_ZERO(mntinf);
-
- mntinf.nullchar = '\0';
- mntinf.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
@@ -62,13 +62,14 @@ index aa15d8b1..551edd4a 100644
- mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
- mntinf.length = sizeof(mntinf);
-
-- mntinf.uid = pOpts->uid;
-- mntinf.gid = pOpts->gid;
-- mntinf.ttl = pOpts->ttl;
-- mntinf.dmode = pOpts->dmode;
-- mntinf.fmode = pOpts->fmode;
-- mntinf.dmask = pOpts->dmask;
-- mntinf.fmask = pOpts->fmask;
+- mntinf.uid = Opts.uid;
+- mntinf.gid = Opts.gid;
+- mntinf.ttl = Opts.ttl;
+- mntinf.dmode = Opts.dmode;
+- mntinf.fmode = Opts.fmode;
+- mntinf.dmask = Opts.dmask;
+- mntinf.fmask = Opts.fmask;
+- mntinf.tag[0] = '\0';
-
- strcpy(mntinf.name, pszShareName);
- strcpy(mntinf.nls_name, "\0");
@@ -82,7 +83,7 @@ index aa15d8b1..551edd4a 100644
if (r == 0)
{
VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
-@@ -378,34 +361,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+@@ -481,34 +462,6 @@ static int vbsvcAutoMountSharedFolderOld
}
else /* r == -1, we got some error in errno. */
{
@@ -117,14 +118,14 @@ index aa15d8b1..551edd4a 100644
switch (errno)
{
/* If we get EINVAL here, the system already has mounted the Shared Folder to another
-@@ -424,7 +379,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+@@ -527,7 +480,6 @@ static int vbsvcAutoMountSharedFolderOld
rc = RTErrConvertFromErrno(errno);
break;
}
- }
}
- #else
- # error "PORTME"
+ # endif
+ }
--
2.14.3
diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch
index 9e9682b..0b01e8b 100644
--- a/VirtualBox-5.1.0-add-Mageia-support.patch
+++ b/VirtualBox-5.1.0-add-Mageia-support.patch
@@ -1,7 +1,6 @@
-diff -rup VirtualBox-5.2.4.orig/include/VBox/ostypes.h VirtualBox-5.2.4/include/VBox/ostypes.h
---- VirtualBox-5.2.4.orig/include/VBox/ostypes.h 2017-12-19 09:21:46.000000000 +0000
-+++ VirtualBox-5.2.4/include/VBox/ostypes.h 2018-01-16 01:33:36.323052771 +0000
-@@ -107,6 +107,8 @@ typedef enum VBOXOSTYPE
+--- ./include/VBox/ostypes.h.orig 2018-12-01 15:08:30.394341093 +0000
++++ ./include/VBox/ostypes.h 2018-12-01 15:08:50.805529628 +0000
+@@ -108,6 +108,8 @@ typedef enum VBOXOSTYPE
VBOXOSTYPE_Xandros_x64 = 0x5D100,
VBOXOSTYPE_Oracle = 0x5E000,
VBOXOSTYPE_Oracle_x64 = 0x5E100,
@@ -10,9 +9,8 @@ diff -rup VirtualBox-5.2.4.orig/include/VBox/ostypes.h VirtualBox-5.2.4/include/
VBOXOSTYPE_FreeBSD = 0x60000,
VBOXOSTYPE_FreeBSD_x64 = 0x60100,
VBOXOSTYPE_OpenBSD = 0x61000,
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd-x11.sh
---- VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2017-12-19 09:22:03.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2018-01-16 01:33:36.545055031 +0000
+--- ./src/VBox/Additions/linux/installer/vboxadd-x11.sh.orig 2018-12-01 15:08:30.395341102 +0000
++++ ./src/VBox/Additions/linux/installer/vboxadd-x11.sh 2018-12-01 15:08:50.806529637 +0000
@@ -94,8 +94,14 @@ install_x11_startup_app() {
x11_autostart="/etc/xdg/autostart"
kde_autostart="/usr/share/autostart"
@@ -28,10 +26,9 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.s
if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ]
then
install -m 0644 $app_src "$mandriva_dir/$app_dest"
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2017-12-19 09:27:42.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2018-01-16 01:33:36.598055571 +0000
-@@ -315,6 +315,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
+--- ./src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2018-12-01 15:08:30.395341102 +0000
++++ ./src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2018-12-01 15:08:50.806529637 +0000
+@@ -331,6 +331,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png");
m_guestOSTypeIconNames.insert("Gentoo", ":/os_gentoo.png");
m_guestOSTypeIconNames.insert("Gentoo_64", ":/os_gentoo_64.png");
@@ -40,10 +37,9 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIcon
m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png");
m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png");
m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png");
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2017-12-19 09:27:51.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-01-16 01:33:36.647056070 +0000
-@@ -138,8 +138,10 @@ static const osTypePattern gs_OSTypePatt
+--- ./src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.orig 2018-12-01 15:08:30.396341111 +0000
++++ ./src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-12-01 15:08:50.807529646 +0000
+@@ -143,8 +143,10 @@ static const osTypePattern gs_OSTypePatt
{ QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" },
{ QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
{ QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" },
@@ -56,22 +52,20 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/
{ QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
{ QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" },
{ QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-12-19 09:27:33.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2018-01-16 01:33:36.653056131 +0000
-@@ -290,6 +290,8 @@
- <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
- <file alias="os_macosx.png">images/os_macosx.png</file>
+--- ./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.orig 2018-12-01 15:08:30.397341121 +0000
++++ ./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2018-12-01 15:08:50.807529646 +0000
+@@ -57,6 +57,8 @@
+ <file alias="os_linux.png">images/os_linux.png</file>
<file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+ <file alias="os_mageia.png">images/os_mageia.png</file>
+ <file alias="os_macosx.png">images/os_macosx.png</file>
+ <file alias="os_mageia_64.png">images/os_mageia_64.png</file>
- <file alias="os_mandriva.png">images/os_mandriva.png</file>
++ <file alias="os_mageia.png">images/os_mageia.png</file>
<file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
- <file alias="os_netbsd.png">images/os_netbsd.png</file>
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-5.2.4/src/VBox/Installer/linux/distributions_rpm
---- VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm 2017-12-19 09:28:05.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Installer/linux/distributions_rpm 2018-01-16 01:33:36.768057301 +0000
-@@ -5,6 +5,16 @@ openSUSE114 = OPENSUSE_11_4
+ <file alias="os_mandriva.png">images/os_mandriva.png</file>
+ <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
+--- ./src/VBox/Installer/linux/distributions_rpm.orig 2018-12-01 15:08:30.397341121 +0000
++++ ./src/VBox/Installer/linux/distributions_rpm 2018-12-01 15:08:50.808529655 +0000
+@@ -6,6 +6,16 @@ openSUSE114 = OPENSUSE_11_4
openSUSE113 = OPENSUSE_11_3
sles11.0 = SLES_11_0
sles10.1 = SLES_10_1
@@ -88,9 +82,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm Virtu
mdv2011.0 = MANDRIVA_2011_0
fedora29 = FEDORA_29
fedora26 = FEDORA_26
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-5.2.4/src/VBox/Installer/linux/VBoxSysInfo.sh
---- VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2017-12-19 09:28:04.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Installer/linux/VBoxSysInfo.sh 2018-01-16 01:33:36.786057485 +0000
+--- ./src/VBox/Installer/linux/VBoxSysInfo.sh.orig 2018-12-01 15:08:30.397341121 +0000
++++ ./src/VBox/Installer/linux/VBoxSysInfo.sh 2018-12-01 15:08:50.808529655 +0000
@@ -44,6 +44,11 @@ get_linux_info () {
# Debian-based system
release=`cat /etc/debian_version`
@@ -103,9 +96,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualB
elif [ -r /etc/mandriva-release ]
then
# Mandriva-based system
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h
---- VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2017-12-19 09:28:07.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2018-01-16 01:33:36.851058146 +0000
+--- ./src/VBox/Main/cbinding/VBoxCAPI_v2_2.h.orig 2018-12-01 15:08:30.399341139 +0000
++++ ./src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2018-12-01 15:08:50.809529665 +0000
@@ -921,7 +921,9 @@ enum CIMOSType
CIMOSType_CIMOS_Linux_2_6_x = 99,
CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
@@ -117,9 +109,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBo
};
/* End of enum CIMOSType Declaration */
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h
---- VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2017-12-19 09:28:07.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2018-01-16 01:33:36.867058309 +0000
+--- ./src/VBox/Main/cbinding/VBoxCAPI_v3_0.h.orig 2018-12-01 15:08:30.400341148 +0000
++++ ./src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2018-12-01 15:08:50.810529674 +0000
@@ -1371,7 +1371,9 @@ enum CIMOSType
CIMOSType_CIMOS_Linux_2_6_x = 99,
CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
@@ -131,9 +122,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBo
};
/* End of enum CIMOSType Declaration */
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h VirtualBox-5.2.4/src/VBox/Main/include/ovfreader.h
---- VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h 2017-12-19 09:28:09.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/include/ovfreader.h 2018-01-16 01:33:36.875058391 +0000
+--- ./src/VBox/Main/include/ovfreader.h.orig 2018-12-01 15:08:30.401341158 +0000
++++ ./src/VBox/Main/include/ovfreader.h 2018-12-01 15:08:50.811529683 +0000
@@ -175,8 +175,10 @@ enum CIMOSType_T
CIMOSType_CIMOS_CentOS_64 = 107,
CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
@@ -146,11 +136,10 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h VirtualBox-5.2
};
enum OVFVersion_T
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-5.2.4/src/VBox/Main/src-all/Global.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp 2017-12-19 09:28:09.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/src-all/Global.cpp 2018-01-16 01:33:36.883058472 +0000
-@@ -250,6 +250,17 @@ const Global::OSType Global::sOSTypes[]
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+--- ./src/VBox/Main/src-all/Global.cpp.orig 2018-12-01 15:08:30.401341158 +0000
++++ ./src/VBox/Main/src-all/Global.cpp 2018-12-01 15:08:50.811529683 +0000
+@@ -251,6 +251,17 @@ const Global::OSType Global::sOSTypes[]
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
+ { "Linux", "Linux", "Mageia", "Mageia (32-bit)",
@@ -166,11 +155,10 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-5.2.
+
{ "Linux", "Linux", "Mandriva", "Mandriva (32-bit)",
VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-5.2.4/src/VBox/Main/src-server/ApplianceImpl.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2017-12-19 09:28:10.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/src-server/ApplianceImpl.cpp 2018-01-16 01:33:36.901058655 +0000
-@@ -165,6 +165,8 @@ g_osTypes[] =
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+--- ./src/VBox/Main/src-server/ApplianceImpl.cpp.orig 2018-12-01 15:08:30.402341167 +0000
++++ ./src/VBox/Main/src-server/ApplianceImpl.cpp 2018-12-01 15:08:50.812529693 +0000
+@@ -132,6 +132,8 @@ static struct
{ ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux },
{ ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux },
{ ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 },
@@ -179,7 +167,7 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Virtu
{ ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva },
{ ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 },
{ ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu },
-@@ -228,6 +230,7 @@ static const osTypePattern g_osTypesPatt
+@@ -195,6 +197,7 @@ static const osTypePattern g_aOsTypesPat
{"SUSE", VBOXOSTYPE_OpenSUSE},
{"Novell", VBOXOSTYPE_OpenSUSE},
{"Red Hat", VBOXOSTYPE_RedHat},
@@ -187,7 +175,7 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Virtu
{"Mandriva", VBOXOSTYPE_Mandriva},
{"Ubuntu", VBOXOSTYPE_Ubuntu},
{"Debian", VBOXOSTYPE_Debian},
-@@ -257,6 +260,7 @@ static const osTypePattern g_osTypesPatt
+@@ -224,6 +227,7 @@ static const osTypePattern g_aOsTypesPat
{"SUSE", VBOXOSTYPE_OpenSUSE_x64},
{"Novell", VBOXOSTYPE_OpenSUSE_x64},
{"Red Hat", VBOXOSTYPE_RedHat_x64},
@@ -195,10 +183,9 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Virtu
{"Mandriva", VBOXOSTYPE_Mandriva_x64},
{"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
{"Debian", VBOXOSTYPE_Debian_x64},
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-5.2.4/src/VBox/Main/xml/Settings.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Main/xml/Settings.cpp 2017-12-19 09:28:13.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/xml/Settings.cpp 2018-01-16 01:33:36.914058788 +0000
-@@ -5075,6 +5075,7 @@ const struct {
+--- ./src/VBox/Main/xml/Settings.cpp.orig 2018-12-01 15:08:30.403341176 +0000
++++ ./src/VBox/Main/xml/Settings.cpp 2018-12-01 15:08:50.814529711 +0000
+@@ -5387,6 +5387,7 @@ const struct {
{ "opensuse", "OpenSUSE" },
{ "fedoracore", "Fedora" },
{ "gentoo", "Gentoo" },
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 4f502bf..bb05c83 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -13,22 +13,19 @@
# major version number, while the kernel module abi is not guaranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel 106108
-%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#global prerel RC1
+%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
%ifarch x86_64
%bcond_without webservice
%else
%bcond_with webservice
%endif
-# el7 doesn't have all texlive requirements
-%if 0%{?rhel}
- %bcond_with docs
-%else
- %bcond_without docs
-%endif
+# Now we use upstream pdf
+%bcond_with docs
%bcond_without vnc
%bcond_with legacy_vboxvideo_drv
+
%if 0%{?fedora} > 27
%bcond_with guest_additions
%else
@@ -36,9 +33,8 @@
%endif
Name: VirtualBox
-Version: 5.2.22
-#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Version: 6.0.0
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -51,6 +47,7 @@ Requires: %{name}-server%{?isa} = %{version}
Obsoletes: %{name}-qt
Source0: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtua...
+Source1: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/UserMa...
Source3: VirtualBox-60-vboxdrv.rules
Source4: VirtualBox.modules
Source5: VirtualBox-60-vboxguest.rules
@@ -61,10 +58,9 @@ Source9: VBoxOGLRun.sh
Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
-Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
+Patch1: VirtualBox-6.0.0-noupdate.patch
Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch23: VirtualBox-5.0.18-xserver_guest.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
@@ -248,7 +244,7 @@ which is generated during the build of main package.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prereltag}
# add Mageia images
cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
@@ -274,19 +270,16 @@ rm -r src/libs/zlib-1.2.8/
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch18 -p1 -b .aiobug
-%patch23 -p1 -b .xserver_guest
#patch27 -p1 -b .gcc
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
%endif
-%patch50 -p1 -b .mageia-support
+# mageia support not ready for 6.0
+#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
%patch61 -p1 -b .automount
-%patch70 -p1 -b .kernel_4.20.patch
-
-# CRLF->LF
-sed -i 's/\r//' COPYING
+#patch70 -p1 -b .kernel_4.20.patch
%build
./configure --disable-kmods \
@@ -300,6 +293,10 @@ sed -i 's/\r//' COPYING
--disable-docs \
%endif
+%if !%{with docs}
+cp %{SOURCE1} UserManual.pdf
+%endif
+
#--enable-vde
#--build-headless --build-libxml2
#--disable-java
@@ -327,7 +324,6 @@ kmk %{_smp_mflags} \
VBOX_WITH_EXTPACK_VBOXDTRACE= \
VBOX_WITH_VBOX_IMG=1 \
VBOX_WITH_SYSFS_BY_DEFAULT=1 \
- VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_USE_SYSTEM_GL_HEADERS=1 \
%{!?legacy_vboxvideo_drv: VBOX_NO_LEGACY_XORG_X11=1 } \
@@ -337,12 +333,12 @@ kmk %{_smp_mflags} \
SDK_VBOX_OPENSSL_LIBS="ssl crypto" \
SDK_VBOX_ZLIB_INCS="" \
%{?with_docs: VBOX_WITH_DOCS=1 } \
- VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
- VBOX_WITH_UPDATE_REQUEST=0 \
+ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
+ VBOX_WITH_UPDATE_REQUEST= \
VBOX_BUILD_PUBLISHER=%{publisher}
-# VBOX_PATH_DOCBOOK_DTD=/usr/share/sgml/docbook/xml-dtd-4.5/ \
-# VBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-stylesheets/ \
+# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+
# doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml
# VBOX_WITH_DOCS_TRANSLATIONS=1 \
# we can't build CHM DOCS we need hhc.exe which is not in source and we need
@@ -417,6 +413,8 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/vboxshell.py \
obj/bin/vbox-img \
obj/bin/VBoxDTrace \
+ obj/bin/VBoxBugReport \
+ obj/bin/VirtualBoxVM \
%if %{with webservice}
obj/bin/vboxwebsrv \
obj/bin/webtest \
@@ -445,6 +443,9 @@ ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
+#ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
+
+
# Components, preserve symlinks
cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
@@ -567,12 +568,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/virtualbox.desktop
# mv ExtensionPacks/VNC $RPM_BUILD_ROOT/usr/lib/virtualbox/ExtensionPacks
#fi
#set_selinux_permissions /usr/lib/virtualbox /usr/share/virtualbox
-#for i in rdesktop-vrdp.tar.gz rdesktop-vrdp-keymaps; do
-# mv $i $RPM_BUILD_ROOT/usr/share/virtualbox; done
-#mv rdesktop-vrdp $RPM_BUILD_ROOT/usr/bin
-#
# vboxautostart-service
+install -d %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
+install -D obj/bin/rdesktop-vrdp-keymaps/* %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
+install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox obj/bin/rdesktop-vrdp.tar.gz
+install -p -m 0755 -t %{buildroot}%{_bindir} obj/bin/rdesktop-vrdp
+
+
%pre
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
@@ -665,6 +668,8 @@ getent passwd vboxadd >/dev/null || \
%doc doc/*cpp doc/VMM
%if %{with docs}
%doc obj/bin/UserManual*.pdf
+%else
+%doc UserManual.pdf
%endif
%license COPYING*
%{_bindir}/VBoxManage
@@ -685,9 +690,9 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/vboxautostart
%{_bindir}/vbox-img
%{_bindir}/VBoxTunctl
+%{_bindir}/rdesktop-vrdp
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
-%exclude %{_libdir}/virtualbox/VirtualBox.so
%exclude %{_libdir}/virtualbox/VBoxDbg.so
%exclude %{_libdir}/virtualbox/VBoxPython2_7.so
%{_libdir}/virtualbox/components
@@ -701,8 +706,10 @@ getent passwd vboxadd >/dev/null || \
%{_libdir}/virtualbox/SUPUninstall
%{_libdir}/virtualbox/VBoxAutostart
%{_libdir}/virtualbox/VBoxVMMPreload
+%{_libdir}/virtualbox/VBoxBugReport
%{_libdir}/virtualbox/VBoxDTrace
%{_libdir}/virtualbox/vbox-img
+%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
# This permissions have to be here, before generator of debuginfo need
# permissions to read this files
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT
@@ -711,7 +718,8 @@ getent passwd vboxadd >/dev/null || \
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
-%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBox
+%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBoxVM
+%{_libdir}/virtualbox/VirtualBox
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/mimetypes/*.png
%{_datadir}/icons/hicolor/scalable/mimetypes/virtualbox.svg
@@ -726,7 +734,6 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/VirtualBox
%{_bindir}/virtualbox
%{_libdir}/virtualbox/VBoxTestOGL
-%{_libdir}/virtualbox/VirtualBox.so
%{_libdir}/virtualbox/VBoxDbg.so
%{_libdir}/virtualbox/nls
%{_datadir}/pixmaps/*.png
@@ -777,6 +784,10 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sun Dec 30 2018 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-1
+- VirtualBox 6.0
+- Patch23 was applied upstream.
+
* Fri Nov 09 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-1
- Update VBox to 5.2.22
- Reenable noupdate.patch
diff --git a/sources b/sources
index 343ea52..7715016 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-c9c2f162ac5f99d28d8c0ca43b19ed01 VirtualBox-5.2.22.tar.bz2
+7008d8ea52e62f50cd9990152326d8d7 VirtualBox-6.0.0.tar.bz2
+3fc65d20a1722d0a3143fdcc444ce7df UserManual.pdf
5 years, 10 months
[VirtualBox] more updates on script helper
by Sérgio M. Basto
commit bc5b54db4d594748693b039920fce9b6eed19313
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Nov 25 00:31:39 2018 +0000
more updates on script helper
update_vbox.sh | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
---
diff --git a/update_vbox.sh b/update_vbox.sh
index 84b0113..1fe3794 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -47,30 +47,4 @@ echo STAGE 5
git pull
rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox-kmod.spec
rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-kmod-$VERSION-$REL.fc$RAWHIDE.src.rpm
-rfpkg ci -c && git show
-#cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new
-#git reset HEAD~1
-#git rm kernel-4.10.0-0.rc5.lnkops.v2.patch
-echo Press enter to continue; read dummy;
-rfpkg push && rfpkg build --nowait
-
-echo Press enter to continue; read dummy;
-#koji-rpmfusion watch-task
-koji-rpmfusion tag-build f27-free-override VirtualBox-$VERSION-$REL.fc27
-koji-rpmfusion wait-repo f27-free-build --build=VirtualBox-$VERSION-$REL.fc27
-git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
-koji-rpmfusion tag-build f26-free-override VirtualBox-$VERSION-$REL.fc26
-
-echo "koji-rpmfusion tag-build f26-free-override VirtualBox-$VERSION-$REL.fc26
-koji-rpmfusion wait-repo f26-free-build --build=VirtualBox-$VERSION-$REL.fc26
-git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master
-Press enter to continue; read dummy;
-koji-rpmfusion tag-build f25-free-override VirtualBox-$VERSION-$REL.fc25
-koji-rpmfusion wait-repo f25-free-build --build=VirtualBox-$VERSION-$REL.fc25
-git checkout f25 && git merge master && git push && rfpkg build --nowait; git checkout master
-Press enter to continue; read dummy;
-koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7
-koji-rpmfusion wait-repo el7-free-build --build=VirtualBox-$VERSION-$REL.el7
-git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master"
-fi
+echo Continue in ..../VirtualBox-kmod/update_vbox.sh
5 years, 10 months
