[VirtualBox-kmod] Update to 6.1.2
by Leigh Scott
commit dacf54c4f7fcc7e6ac0c86da61b8e38b4ed923b8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jan 19 10:34:10 2020 +0000
Update to 6.1.2
VirtualBox-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index a3a6fa9..bba8d96 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -44,8 +44,8 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 6.1.0
-Release: 3%{?dist}
+Version: 6.1.2
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -145,6 +145,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Sun Jan 19 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 6.1.2-1
+- Update to 6.1.2
+
* Wed Dec 25 2019 Sérgio Basto <sergio(a)serjux.com> - 6.1.0-3
- Removing "old" way to build kmod's
4 years, 10 months
[VirtualBox/el7] Update VBox to 6.1.2
by Sérgio M. Basto
Summary of changes:
791f776... Update VBox to 6.1.2 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[VirtualBox/f30] Update VBox to 6.1.2
by Sérgio M. Basto
Summary of changes:
791f776... Update VBox to 6.1.2 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[VirtualBox/f31] Update VBox to 6.1.2
by Sérgio M. Basto
Summary of changes:
791f776... Update VBox to 6.1.2 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[VirtualBox] Update VBox to 6.1.2
by Sérgio M. Basto
commit 791f776c20f66a2dec7c7b212b6010d3a1cce85b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 19 02:12:46 2020 +0000
Update VBox to 6.1.2
.gitignore | 1 +
VirtualBox.spec | 5 ++++-
sources | 4 ++--
update_vbox.sh | 8 ++++----
4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b6ed47..e990a3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-6.0.12.tar.bz2
/VirtualBox-6.0.14.tar.bz2
/VirtualBox-6.1.0.tar.bz2
+/VirtualBox-6.1.2.tar.bz2
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c6b70d4..de498fd 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,7 +45,7 @@
%endif
Name: VirtualBox
-Version: 6.1.0
+Version: 6.1.2
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -871,6 +871,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Jan 18 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.2-1
+- Update VBox to 6.1.2
+
* Wed Dec 18 2019 Sérgio Monteiro Basto <sergio(a)serjux.com> - 6.1.0-1
- Update VBox to 6.1.0
diff --git a/sources b/sources
index 5a18108..78d89c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.1.0.tar.bz2) = 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618
-SHA512 (UserManual.pdf) = 20aa696821faf2c87a76d2c93a5fdd29e79d42d712774b50ae5876e899c6399fac7c0edbe66fed0d8adfec933ebe4d12ecdc4240796c327c3224cd92b52704ca
+SHA512 (VirtualBox-6.1.2.tar.bz2) = 476dedd9dd7a213bd70920f4cdf594b5336555f31e5becb15b5c01d88fa7bed917258831af31600514362384401fd7040cb748a7c76896e4a027bef05026b585
+SHA512 (UserManual.pdf) = 8010804c58cb03b6f8995f4da5edd5c348d08ccf391e4d5ac1263ed0733bd5362e33bb9c60fcecb967d94136b868d6172dcc570b4535e01a9bd274a63314e16f
diff --git a/update_vbox.sh b/update_vbox.sh
index 453b574..ff8e7ae 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.1.0
+VERSION=6.1.2
REL=1
RAWHIDE=32
if [ -z "$1" ]
@@ -16,6 +16,7 @@ git pull
rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec
rm UserManual.pdf
spectool -g VirtualBox.spec
+rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf
rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm
echo Press enter to continue; read dummy;
fi
@@ -23,7 +24,6 @@ fi
if test $stage -le 1
then
echo STAGE 1
-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
@@ -41,9 +41,9 @@ fi
if test $stage -le 3
then
echo STAGE 3
-git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master
+#git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master
+#echo Press enter to continue; read dummy;
fi
-echo Press enter to continue; read dummy;
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
echo "Continue in ../VirtualBox-kmod/update_vbox.sh"
4 years, 10 months
[xine-lib] Disable libssh2 for EL8
by Xavier Bachelot
commit 2d6e219a44d9533991948de44ed160415f872e55
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Jan 18 23:34:33 2020 +0100
Disable libssh2 for EL8
xine-lib.spec | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 83436dc..a696fcd 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -21,6 +21,7 @@
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
%global _without_xvmc 1
+ %global _without_libssh2 1
%endif
%ifarch %{ix86}
@@ -36,7 +37,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.10
-Release: 1%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 2%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -87,7 +88,7 @@ BuildRequires: libmpcdec-devel
%{!?_without_nfs:BuildRequires: libnfs-devel}
%{!?_without_png:BuildRequires: libpng-devel >= 1.6.0}
BuildRequires: libsmbclient-devel
-BuildRequires: libssh2-devel
+%{!?_without_libssh2:BuildRequires: libssh2-devel}
BuildRequires: libtheora-devel
BuildRequires: libtool
BuildRequires: libv4l-devel
@@ -284,7 +285,7 @@ mkdir -p %{buildroot}%{codecdir}
%{!?_without_nfs:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_nfs.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_ssh.so
+%{!?_without_libssh2:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_ssh.so}
%{?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_vcd.so
@@ -339,6 +340,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Sat Jan 18 2020 Xavier Bachelot <xavier(a)bachelot.org> 1.2.10-2
+- Disable libssh2 for EL8.
+
* Fri Dec 13 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.10-1
- Update to 1.2.10.
- Enable aom for EL7.
4 years, 10 months
