[telegram-desktop/f28: 2/2] Merge branch 'master' into f28
by Vitaly Zaitsev
commit f2a9d71863539800e3a2c83793e4c5af45eaf798
Merge: 90b8262 0c5cedd
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Jan 8 14:58:57 2019 +0500
Merge branch 'master' into f28
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-gcc-fix.patch | 21 ---------------------
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 8 ++++----
7 files changed, 9 insertions(+), 29 deletions(-)
---
5 years, 3 months
[telegram-desktop/f28: 1/2] Updated to 1.5.4.
by Vitaly Zaitsev
commit 0c5cedd5036bb7b80e9d5fe9736179c15a3757e5
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Jan 8 10:58:34 2019 +0100
Updated to 1.5.4.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-gcc-fix.patch | 21 ---------------------
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 8 ++++----
7 files changed, 9 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d405880..0e2d977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
/tdesktop-1.5.1.tar.gz
/tdesktop-1.5.2.tar.gz
/tdesktop-1.5.3.tar.gz
+/tdesktop-1.5.4.tar.gz
diff --git a/sources b/sources
index 1e1da13..8d8b41d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b92e75c44c9d4c9fd96b1d19eb3a666d crl-4291015.tar.gz
-547e3921cdca9fdcb24d1965402ac102 tdesktop-1.5.3.tar.gz
+25a2a505526a732705e6756f1cfe9549 tdesktop-1.5.4.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 2193c71..bdb505a 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From f3abd4b1fe9c40fa81959a32ef22b2c34b1e18e6 Mon Sep 17 00:00:00 2001
+From 079c889ab66fec2e0a24b9aeeb2e54c4fe4545b6 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 7086373..cc83903 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From b718fe89aa765b21837a7ea5dc17075e0b553f96 Mon Sep 17 00:00:00 2001
+From 14683b04dc12bc6c4a5e780285d6df4a71425275 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index 3ff9b22..5117325 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From f9a4b9b980a83341fbefcd3c7591520a0a290203 Mon Sep 17 00:00:00 2001
+From 814cbd133ea39ba9b5056bcf8d25e29266b9622a Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 968b67c..8cf5d94 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -12,7 +12,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -32,9 +32,6 @@ Patch0: %{name}-build-fixes.patch
Patch1: %{name}-system-fonts.patch
Patch2: %{name}-unbundle-minizip.patch
-# Temporary patches
-Patch100: %{name}-gcc-fix.patch
-
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Recommends: libappindicator-gtk3%{?_isa}
Requires: qt5-qtimageformats%{?_isa}
@@ -155,6 +152,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Mon Dec 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.4-1
+- Updated to 1.5.4.
+
* Sun Dec 23 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.5.3-1
- Updated to 1.5.3.
5 years, 3 months
[dfhack] Update dfhack to release r2 for 0.44.12.
by Ben Rosser
commit 9a162ff40913f55758087fed2cfcbbd5d95d9240
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Jan 7 22:51:53 2019 -0500
Update dfhack to release r2 for 0.44.12.
.gitignore | 4 ++++
dfhack.spec | 17 ++++++++++-------
git-describe.h | 8 ++++----
sources | 8 ++++----
4 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 30e2d80..25bb8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@
/dfhack-jsoncpp-ddabf50.tar.gz
/dfhack-scripts-4a1953f.tar.gz
/dfhack-stonesense-4a1953f.tar.gz
+/dfhack-0.44.12-r2.tar.gz
+/dfhack-df-structures-4421583.tar.gz
+/dfhack-scripts-4a0f63e.tar.gz
+/dfhack-stonesense-4a0f63e.tar.gz
diff --git a/dfhack.spec b/dfhack.spec
index ad3c976..e79c070 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -10,13 +10,13 @@
# dfhack submodule: depends/jsoncpp-sub
%global commit11 ddabf50f72cf369bf652a95c4d9fe31a1865a781
# dfhack submodule: library/xml
-%global commit12 23500e4e9bd1885365d0a2ef1746c321c1dd5094
+%global commit12 44215836d5b57c3722b126aaf481f652385f3a23
# dfhack submodule: plugins/isoworld
%global commit13 fbbf9e46458e41707c27f2a4438452a579490db1
# dfhack submodule: plugins/stonesense
-%global commit14 4a1953f27c6acd1ceeb2d5447613c106e708c26c
+%global commit14 4a0f63e044d02532c948d67780dfd128fbd6d043
# dfhack submodule: scripts
-%global commit15 66b39d888e5f2d4f5c194ece08ba62ac7f110478
+%global commit15 a242a7cd81ae7046146f86c3103360449e1d9ca8
# End autogenerated commit lines.
@@ -30,7 +30,7 @@
# dfhack version string.
%global dfversion 0.44.12
-%global hackrelease r1
+%global hackrelease r2
# Define dfhack build architecture.
%global dfhack_arch 32
@@ -40,7 +40,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 0.%{hackrelease}%{?dist}.1
+Release: 2.%{hackrelease}%{?dist}
Summary: Memory hacking library for Dwarf Fortress and a set of tools that use it
# It'd be nice if we could unbundle some of these things, but I suspect it won't happen.
@@ -330,7 +330,10 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
-* Sat Dec 01 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-0.r1.1
+* Tue Jan 08 2019 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-2.r2
+- Updated to latest upstream release for 0.44.12.
+
+* Sat Dec 01 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-1.r1
- Updated to latest upstream release for 0.44.12.
- Add new submodule for jsoncpp.
@@ -340,7 +343,7 @@ rm -f docs/build.sh
* Fri Jul 27 2018 RPM Fusion Release Engineering <sergio(a)serjux.com> - 0.44.10-2.r1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-* Mon Jun 04 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.10-0.r1.1
+* Mon Jun 04 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.10-1.r1
- Updated to latest upstream release for 0.44.10.
* Mon Apr 09 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.09-1.r1
diff --git a/git-describe.h b/git-describe.h
index 96de0e5..5a1be70 100644
--- a/git-describe.h
+++ b/git-describe.h
@@ -1,6 +1,6 @@
-#define DFHACK_GIT_DESCRIPTION "0.44.12-r1-0-gc2a64b35"
-#define DFHACK_GIT_COMMIT "c2a64b3573abbee549761f5c1c2626eec7a6e81c"
-#define DFHACK_GIT_XML_EXPECTED_COMMIT "23500e4e9bd1885365d0a2ef1746c321c1dd5094"
-#define DFHACK_GIT_XML_COMMIT "23500e4e9bd1885365d0a2ef1746c321c1dd5094"
+#define DFHACK_GIT_DESCRIPTION "0.44.12-r2-0-g315852a2"
+#define DFHACK_GIT_COMMIT "315852a2513679ca1afe0d53b34974cefd946f89"
+#define DFHACK_GIT_XML_EXPECTED_COMMIT "44215836d5b57c3722b126aaf481f652385f3a23"
+#define DFHACK_GIT_XML_COMMIT "44215836d5b57c3722b126aaf481f652385f3a23"
#define DFHACK_GIT_XML_MATCH
#define DFHACK_BUILD_ID ""
diff --git a/sources b/sources
index 4169cb2..65aa99b 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
35cfdf121436218c1cd9d317c7599bc5 dfhack-isoworld-fbbf9e4.tar.gz
cd8054e0be8c44c5b03555471a91f78a dfhack-clsocket-6a9153d.tar.gz
-e0294082f4238a1a5bb38a8524bbb6d6 dfhack-0.44.12-r1.tar.gz
-e135ff67da74e32ea0ecb37387d7f41a dfhack-df-structures-23500e4.tar.gz
e43eda5bf91c3a8fe343be6a596c970e dfhack-jsoncpp-ddabf50.tar.gz
-eb426fb5029802d3b35f90a2a20644d2 dfhack-scripts-4a1953f.tar.gz
-9f94b392ac44523d435d973c496f12af dfhack-stonesense-4a1953f.tar.gz
+589f12861db5630c1570b1ab3137d858 dfhack-0.44.12-r2.tar.gz
+08906486d402c9c2b6fbbbffe76d914c dfhack-df-structures-4421583.tar.gz
+8e3adba214bc25779ab079f6c25c84d3 dfhack-scripts-4a0f63e.tar.gz
+dc20471cb0974bd74bcdaa0fddfdbcb6 dfhack-stonesense-4a0f63e.tar.gz
5 years, 3 months
[dwarftherapist] Update to latest release and fix setcap post script.
by Ben Rosser
commit dc7f579f2e4d363e076b29407e367cd3bb10a026
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Jan 7 22:34:54 2019 -0500
Update to latest release and fix setcap post script.
.gitignore | 1 +
dwarftherapist.spec | 7 +++++--
sources | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4204c20..5295371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/dwarftherapist-39.3.1.tar.gz
/dwarftherapist-40.0.0.tar.gz
/dwarftherapist-41.0.2.tar.gz
+/dwarftherapist-41.0.3.tar.gz
diff --git a/dwarftherapist.spec b/dwarftherapist.spec
index d09ce38..844711e 100644
--- a/dwarftherapist.spec
+++ b/dwarftherapist.spec
@@ -1,5 +1,5 @@
Name: dwarftherapist
-Version: 41.0.2
+Version: 41.0.3
Release: 1%{?dist}
Summary: Management tool designed to run side-by-side with Dwarf Fortress
@@ -95,7 +95,7 @@ rm %{buildroot}%{_docdir}/dwarftherapist/LICENSE.txt
# Post install script; set cap permissions.
%post
-sudo setcap cap_sys_ptrace=eip %{_bindir}/DwarfTherapist
+sudo setcap cap_sys_ptrace=eip %{_bindir}/dwarftherapist
%files
%{_bindir}/dwarftherapist
@@ -110,6 +110,9 @@ sudo setcap cap_sys_ptrace=eip %{_bindir}/DwarfTherapist
%license LICENSE.txt
%changelog
+* Tue Jan 08 2019 Ben Rosser <rosser.bjr(a)gmail.com> - 41.0.3-1
+- Update to latest release and fix setcap post script.
+
* Fri Aug 10 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 41.0.2-1
- Updated to latest upstream release for 0.44.12.
diff --git a/sources b/sources
index 6706d35..4d97aca 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
f16f6b7b16ee4b38addc5d1c016b303b dwarftherapist-41.0.2.tar.gz
+ef48360d1edaf7b8485143041242a4ad dwarftherapist-41.0.3.tar.gz
5 years, 3 months
[VirtualBox] Enable Python3 support, move all SDK python files to devel sub-package, they
by Sérgio M. Basto
commit 16ead04897a9bbc2e588055c379d7670b338cf0b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jan 7 06:20:00 2019 +0000
Enable Python3 support, move all SDK python files to devel sub-package, they
may be used by python2 and python3.
Add patch VBoxVNC.fix.patch from Debian
Issue with EXTPACK_VBOXDTRACE was fix some time ago.
007-python2-path.patch | 9 +++++++++
37-python-3.7-support.patch | 17 +++++++++++++++++
VBoxVNC.fix.patch | 17 +++++++++++++++++
VirtualBox.spec | 46 ++++++++++++++++++++++++++++++++++-----------
4 files changed, 78 insertions(+), 11 deletions(-)
---
diff --git a/007-python2-path.patch b/007-python2-path.patch
new file mode 100644
index 0000000..b7d19ce
--- /dev/null
+++ b/007-python2-path.patch
@@ -0,0 +1,9 @@
+# 2013 © Sébastien Luttringer
+--- ./src/VBox/Frontends/VBoxShell/vboxshell.py.orig 2018-12-18 12:59:24.000000000 +0000
++++ ./src/VBox/Frontends/VBoxShell/vboxshell.py 2019-01-03 22:05:42.645245995 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ # $Id: vboxshell.py $
+
diff --git a/37-python-3.7-support.patch b/37-python-3.7-support.patch
new file mode 100644
index 0000000..51d2cd1
--- /dev/null
+++ b/37-python-3.7-support.patch
@@ -0,0 +1,17 @@
+Description: add python 3.7m as a supported version
+Author: Michael Hudson-Doyle <michael.hudson(a)ubuntu.com>
+Origin: vendor
+Last-Update: 2018-07-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure
++++ b/configure
+@@ -1963,7 +1963,7 @@
+ }
+ EOF
+ found=
+- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
++ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m"
+ for p in $PYTHONDIR; do
+ for d in $SUPPYTHONLIBS; do
+ for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/VBoxVNC.fix.patch b/VBoxVNC.fix.patch
new file mode 100644
index 0000000..fc8120f
--- /dev/null
+++ b/VBoxVNC.fix.patch
@@ -0,0 +1,17 @@
+--- a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp 2017-03-16 03:17:09.000000000 +0800
++++ b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp 2017-03-24 10:57:12.381136918 +0800
+@@ -820,6 +820,14 @@
+ }
+ }
+
++ if(!instance->mScreenBuffer) {
++ VRDEResize(hServer);
++ if(!instance->mScreenBuffer) {
++ LogRel(("VNCServerImpl::VRDEUpdate: Cannot get frame buffer"));
++ return;
++ }
++ }
++
+ uint32_t width = instance->FrameInfo.cWidth;
+ uint32_t bpp = instance->FrameInfo.cBitsPerPixel / 8;
+ uint32_t joff = order->y * width + order->x;
diff --git a/VirtualBox.spec b/VirtualBox.spec
index bb05c83..e53a62e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -34,7 +34,7 @@
Name: VirtualBox
Version: 6.0.0
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -64,6 +64,10 @@ Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
+Patch30: 37-python-3.7-support.patch
+Patch32: VBoxVNC.fix.patch
+# from ArchLinux
+Patch40: 007-python2-path.patch
# from Mageia
Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
@@ -85,6 +89,7 @@ BuildRequires: libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python2-devel
+BuildRequires: python3-devel
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
BuildRequires: qt5-qtbase-devel
@@ -208,6 +213,15 @@ Obsoletes: python-VirtualBox < %{version}-%{release}
Python XPCOM bindings to %{name}.
+%package -n python3-%{name}
+Summary: Python3 bindings for %{name}
+Group: Development/Libraries
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-%{name}
+Python3 XPCOM bindings to %{name}.
+
%package guest-additions
Summary: %{name} Guest Additions
Group: System Environment/Base
@@ -274,6 +288,9 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
%endif
+%patch30 -p1
+%patch32 -p1
+%patch40 -p1
# mageia support not ready for 6.0
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
@@ -321,7 +338,6 @@ kmk %{_smp_mflags} \
VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
VBOX_WITH_TESTCASES= \
VBOX_WITH_VALIDATIONKIT= \
- VBOX_WITH_EXTPACK_VBOXDTRACE= \
VBOX_WITH_VBOX_IMG=1 \
VBOX_WITH_SYSFS_BY_DEFAULT=1 \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
@@ -370,7 +386,6 @@ install -d %{buildroot}%{_datadir}/pixmaps
install -d %{buildroot}%{_datadir}/mime/packages
install -d %{buildroot}%{_datadir}/icons
install -d %{buildroot}%{_prefix}/src/%{name}-kmod-%{version}
-install -d %{buildroot}%{python2_sitelib}/virtualbox
# Libs
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
@@ -386,9 +401,6 @@ install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
install -p -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/VBoxTunctl
-# Fixes ERROR: ambiguous python shebang in F30
-sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' obj/bin/vboxshell.py
-
# Executables
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VirtualBox \
@@ -453,11 +465,15 @@ cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
obj/bin/nls/*
-# SDK
+# Python
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
%{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
+VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
+ %{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
popd
+
+# SDK
cp -rp obj/bin/sdk/. %{buildroot}%{_libdir}/virtualbox/sdk
rm -rf %{buildroot}%{_libdir}/virtualbox/sdk/installer
@@ -571,7 +587,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/virtualbox.desktop
# 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/rdesktop-vrdp-keymaps obj/bin/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
@@ -749,14 +765,16 @@ getent passwd vboxadd >/dev/null || \
%files devel
%{_libdir}/virtualbox/sdk
-%exclude %{_libdir}/virtualbox/sdk/bindings/xpcom/python
%files -n python2-%{name}
%{_libdir}/virtualbox/*.py*
-%{python2_sitelib}/virtualbox
%{python2_sitelib}/vboxapi*
%{_libdir}/virtualbox/VBoxPython2_7.so
-%{_libdir}/virtualbox/sdk/bindings/xpcom/python
+
+%files -n python3-%{name}
+%{_libdir}/virtualbox/*.py*
+%{python3_sitelib}/vboxapi*
+%{_libdir}/virtualbox/VBoxPython3*.so
%if %{with guest_additions}
%files guest-additions
@@ -784,6 +802,12 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Mon Jan 07 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-2
+- Enable Python3 support, move all SDK python files to devel sub-package, they
+ may be used by python2 and 3.
+- Add patch VBoxVNC.fix.patch from Debian
+- Issue with EXTPACK_VBOXDTRACE was fix some time ago.
+
* Sun Dec 30 2018 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-1
- VirtualBox 6.0
- Patch23 was applied upstream.
5 years, 3 months
[unifi/f29] Update java requires to address RFBZ#5126.
by Richard Shaw
commit 11ee5e8eb4fc4762a4e4d0b2b73796bf617d78cf
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sun Jan 6 08:03:04 2019 -0600
Update java requires to address RFBZ#5126.
SETUP | 22 ++++++++++++++++++++++
unifi.spec | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/SETUP b/SETUP
index 7dd8cc0..094a2c9 100644
--- a/SETUP
+++ b/SETUP
@@ -1,3 +1,25 @@
+##############
+### Fedora ###
+##############
+
+For Fedora java 1.8.0 must be selected:
+
+# alternatives --config java
+
+There are 2 programs which provide 'java'.
+
+ Selection Command
+-----------------------------------------------
+ 1 java-openjdk.x86_64 (/usr/lib/jvm/java-11-openjdk-11.0.1.13-11.rolling.fc29.x86_64/bin/java)
+*+ 2 java-1.8.0-openjdk.x86_64 (/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-11.fc29.x86_64/jre/bin/java)
+
+Enter to keep the current selection[+], or type selection number:
+
+
+#######################
+#### RHEL/CentOS/SL ###
+#######################
+
For RHEL/CentOS/SL etc, you will also need Fedora EPEL repository installed for mongodb, on CentOS it's already available:
(as root or sudo)
diff --git a/unifi.spec b/unifi.spec
index a24d0b2..9f63bb9 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -29,7 +29,7 @@ BuildRequires: firewalld-filesystem
BuildRequires: %{_bindir}/execstack
Requires: mongodb-server
-Requires: java-headless >= 1:1.8.0
+Requires: java-1.8.0-openjdk-headless
Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python
5 years, 3 months