[VirtualBox] Create VirtualBox-qt sub-package rfbz#1169
by Sérgio M. Basto
commit 4066043c4292038c762690ffc4a8051262638d42
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 17 07:14:20 2016 +0100
Create VirtualBox-qt sub-package rfbz#1169
Create VirtualBox-webservice in a sub-package
Add python things to python sub-package
Roolback "Set attributes on make install" I forgot that we just can change this
permissions after generate debuginfo.
VirtualBox.spec | 105 ++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 67 insertions(+), 38 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 885baf1..123e51a 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -132,6 +132,11 @@ ExclusiveArch: i386 x86_64
%endif
Requires: %{name}-kmod = %{version}
+%if 0%{?fedora} > 0
+Recommends: %{name}-qt = %{version}
+%else
+Requires: %{name}-qt = %{version}
+%endif
Provides: %{name}-kmod-common = %{version}-%{release}
Conflicts: %{name}-guest <= %{version}-%{release}
Conflicts: %{name}-guest-additions <= %{version}-%{release}
@@ -140,6 +145,25 @@ Conflicts: %{name}-guest-additions <= %{version}-%{release}
A general-purpose full virtualizer and emulator for 32-bit and
64-bit x86 based PC-compatible machines.
+%package qt
+Summary: Qt GUI part for %{name}
+Group: System/Emulators/PC
+Requires: %{name} = %{version}
+Provides: %{name}-gui = %{version}
+
+%description qt
+Qt GUI part for %{name}.
+
+%if %{with webservice}
+%package webservice
+Summary: WebService GUI part for %{name}
+Group: System/Emulators/PC
+Requires: %{name} = %{version}
+Provides: %{name}-gui = %{version}
+
+%description webservice
+webservice GUI part for %{name}.
+%endif
%package devel
Summary: %{name} SDK
@@ -259,6 +283,7 @@ sed -i 's@/usr/lib@/usr/lib64@' src/VBox/Installer/linux/VBox.sh
--disable-docs \
%endif
+#--enable-vde
#--build-headless --build-libxml2
#--disable-java
#--disable-xpcom
@@ -327,18 +352,15 @@ install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
install -p -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/VBoxTunctl
-# Executables with special permissions
-install -p -m 4511 -t %{buildroot}%{_libdir}/virtualbox \
+# Executables
+install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
+ obj/bin/VirtualBox \
obj/bin/VBoxHeadless \
obj/bin/VBoxNetDHCP \
obj/bin/VBoxNetNAT \
obj/bin/VBoxNetAdpCtl \
obj/bin/VBoxVolInfo \
obj/bin/VBoxSDL \
- obj/bin/VirtualBox
-
-# Executables
-install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/SUPInstall \
obj/bin/SUPLoggerCtl \
obj/bin/SUPUninstall \
@@ -500,10 +522,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
-%if %{with webservice}
- %systemd_post vboxweb-httpd.service
-%endif
-
# Icon Cache
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
# mimeinfo F23 only
@@ -521,8 +539,13 @@ fi
# should be in kmod package, not here
/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
-%preun
%if %{with webservice}
+%post webservice
+ %systemd_post vboxweb-httpd.service
+%endif
+
+%if %{with webservice}
+%preun webservice
%systemd_preun vboxweb.service
%endif
@@ -537,6 +560,7 @@ if [ $1 -eq 0 ] ; then
fi
%if %{with webservice}
+%postun webservice
%systemd_postun_with_restart vboxweb.service
%endif
@@ -609,25 +633,19 @@ fi
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
-%{_bindir}/VirtualBox
%{_bindir}/VBoxAutostart
%{_bindir}/vboxautostart
%{_bindir}/VBoxDTrace
%{_bindir}/vboxdtrace
%{_bindir}/vbox-img
-%if %{with webservice}
-%{_bindir}/vboxwebsrv
-%endif
%{_bindir}/VBoxVRDP
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
-%{_libdir}/virtualbox/*.py*
+%exclude %{_libdir}/virtualbox/VirtualBox.so
%{_libdir}/virtualbox/components
-%{_libdir}/virtualbox/nls
%{_libdir}/virtualbox/VBoxExtPackHelperApp
%{_libdir}/virtualbox/VBoxManage
%{_libdir}/virtualbox/VBoxSVC
-%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
%{_libdir}/virtualbox/SUPInstall
@@ -637,39 +655,48 @@ fi
%{_libdir}/virtualbox/VBoxVMMPreload
%{_libdir}/virtualbox/VBoxDTrace
%{_libdir}/virtualbox/vbox-img
-%if %{with webservice}
-%{_libdir}/virtualbox/vboxwebsrv
-%{_libdir}/virtualbox/webtest
-%endif
-%{_libdir}/virtualbox/VBoxNetNAT
-%{_libdir}/virtualbox/VBoxVolInfo
-%{_libdir}/virtualbox/VBoxHeadless
-%{_libdir}/virtualbox/VBoxSDL
-%{_libdir}/virtualbox/VBoxNetDHCP
-%{_libdir}/virtualbox/VBoxNetAdpCtl
-%{_libdir}/virtualbox/VirtualBox
-%{_datadir}/pixmaps/*
+# This permissions have to be here, before generator of debuginfo need
+# permissions to read this files
+%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT
+%attr(4511,root,root) %{_libdir}/virtualbox/VBoxVolInfo
+%attr(4511,root,root) %{_libdir}/virtualbox/VBoxHeadless
+%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
%{_datadir}/icons/*
%{_datadir}/mime/*
-%{_datadir}/applications/*.desktop
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%{_udevrulesdir}/90-vboxdrv.rules
%{_prefix}/lib/modules-load.d/%{name}.conf
+%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
+
+%files qt
+%{_bindir}/VirtualBox
+%{_libdir}/virtualbox/VBoxTestOGL
+%{_libdir}/virtualbox/nls
+%{_libdir}/virtualbox/VirtualBox.so
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*.desktop
+
%if %{with webservice}
+%files webservice
+%{_bindir}/vboxwebsrv
%{_unitdir}/vboxweb.service
+%{_libdir}/virtualbox/vboxwebsrv
+%{_libdir}/virtualbox/webtest
%endif
-%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
-
%files devel
%{_libdir}/virtualbox/sdk
-
+%exclude %{_libdir}/virtualbox/sdk/bindings/xpcom/python
%files -n python-%{name}
+%{_libdir}/virtualbox/*.py*
%{python2_sitelib}/virtualbox
%{python2_sitelib}/vboxapi*
-
+%{_libdir}/virtualbox/sdk/bindings/xpcom/python
%files guest-additions
%license COPYING*
@@ -694,9 +721,11 @@ fi
%changelog
* Thu Sep 15 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-2
-- Set attributes on make install
-- Packaging:Scriptlets review Systemd, Icon Cache, mimeinfo and
- desktop-database
+- Packaging:Scriptlets review Systemd, Icon Cache, mimeinfo and desktop-database
+- Add back RPMFusion strings to VBox.sh it is used on /usr/bin/VBox
+- Create VirtualBox-qt sub-package rfbz#1169
+- Create VirtualBox-webservice in a sub-package
+- Add python things to python sub-package
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
- Update VBox to 5.1.6
8 years, 2 months
[VirtualBox] Use PeriodNever like Mageia
by Sérgio M. Basto
commit 16604ed0f2a04597403cd0abeb18667d4c135df3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 17 05:31:31 2016 +0100
Use PeriodNever like Mageia
VirtualBox-OSE-4.1.4-noupdate.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/VirtualBox-OSE-4.1.4-noupdate.patch b/VirtualBox-OSE-4.1.4-noupdate.patch
index d5a2af1..ec31011 100644
--- a/VirtualBox-OSE-4.1.4-noupdate.patch
+++ b/VirtualBox-OSE-4.1.4-noupdate.patch
@@ -16,7 +16,7 @@ Let's not bug the user with updates that are not yet packaged.
populate();
PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
- m_periodIndex = index == PeriodUndefined ? Period1Day : index;
-+ m_periodIndex = index == PeriodUndefined ? Period1Week : index;
++ m_periodIndex = index == PeriodUndefined ? PeriodNever : index;
}
/* Parse 'date' value: */
8 years, 2 months
[VirtualBox] Add back RPMFusion strings to VBox.sh it is used
by Sérgio M. Basto
commit db091b25cc10042c5f0123d91b5288caaabb3f21
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 17 04:49:08 2016 +0100
Add back RPMFusion strings to VBox.sh it is used
on /usr/bin/VBox
VirtualBox-5.1.0-strings.patch | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox-5.1.0-strings.patch b/VirtualBox-5.1.0-strings.patch
index 1ec6b16..f2d9666 100644
--- a/VirtualBox-5.1.0-strings.patch
+++ b/VirtualBox-5.1.0-strings.patch
@@ -1,3 +1,4 @@
+Replace some strings with ones that (sometimes) make more sense.
--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2016-07-15 22:49:01.368518594 +0200
+++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2016-07-15 22:52:19.852192522 +0200
@@ -101,11 +101,12 @@
@@ -41,9 +42,9 @@
);
---- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2016-07-15 22:49:17.314169835 +0200
-+++ ./src/VBox/VMM/VMMR3/VM.cpp 2016-07-15 22:53:46.385309383 +0200
-@@ -384,8 +384,8 @@
+--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2016-09-12 17:19:22.000000000 +0100
++++ ./src/VBox/VMM/VMMR3/VM.cpp 2016-09-16 04:02:17.704237277 +0100
+@@ -376,8 +376,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
@@ -54,14 +55,45 @@
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -426,8 +426,8 @@
+@@ -418,8 +418,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/sbin/vboxconfig' as root");
-+ "reason. Install the kernel module by executing 'dnf install akmod-VirtualBox'"
++ "reason. Install the kernel module by executing 'dnf install akmod-VirtualBox kernel-devel-$(uname -r)'"
+ "and 'akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
+--- ./src/VBox/Installer/linux/VBox.sh.orig 2016-09-16 03:39:44.163517672 +0100
++++ ./src/VBox/Installer/linux/VBox.sh 2016-09-16 04:02:17.704237277 +0100
+@@ -60,19 +60,24 @@ elif ! lsmod|grep -q vboxdrv; then
+ cat << EOF
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
+ available for the current kernel (`uname -r`) or it failed to
+- load. Please recompile the kernel module and install it by
++ load. Please try load the kernel module by executing as root
+
+- sudo /sbin/vboxconfig
++ dnf install akmod-VirtualBox kernel-devel-$(uname -r)
++ akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service
+
+ You will not be able to start VMs until this problem is fixed.
+ EOF
+ elif [ ! -c /dev/vboxdrv ]; then
+ cat << EOF
+ WARNING: The character device /dev/vboxdrv does not exist. Try
++install the kernel module by executing as root
+
+- sudo /sbin/vboxconfig
++ dnf install akmod-VirtualBox kernel-devel-$(uname -r)
++ akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service
+
+- and if that is not successful, try to re-install the package.
++ and if that is not successful, try see if
++ http://rpmfusion.org/Howto/VirtualBox have any solution or contact
++ RPMFusion by Mailing Lists, IRC or Bugzilla.
+
+ You will not be able to start VMs until this problem is fixed.
+ EOF
8 years, 2 months
[lpf-spotify-client] Update to 1.0.37.152.gc83ea995_42
by Sérgio M. Basto
commit ced18c89abf0b024631592b927a930f33f86fb01
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Sep 18 08:28:44 2016 +0100
Update to 1.0.37.152.gc83ea995_42
lpf-spotify-client.spec | 9 ++++++---
spotify-client.spec.in | 11 +++++++----
2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/lpf-spotify-client.spec b/lpf-spotify-client.spec
index 9eed86b..e7a2660 100644
--- a/lpf-spotify-client.spec
+++ b/lpf-spotify-client.spec
@@ -11,12 +11,12 @@
Name: lpf-spotify-client
# Upstream spotify version, verbatim.
-Version: 1.0.36.120.g536a862f
-Release: 2%{?dist}
+Version: 1.0.37.152.gc83ea995
+Release: 1%{?dist}
Summary: Spotify music player native client package bootstrap
License: MIT
-URL: http://leamas.fedorapeople.org/lpf-spotify-client/
+URL: https://github.com/leamas/spotify-make
Group: Development/Tools
BuildArch: noarch
# There's no source, only a spec building the target package.
@@ -76,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Sun Sep 18 2016 Sérgio Basto <sergio(a)serjux.com> - 1.0.37.152.gc83ea995-1
+- Update to 1.0.37.152.gc83ea995_42
+
* Wed Aug 31 2016 Sérgio Basto <sergio(a)serjux.com> - 1.0.36.120.g536a862f-2
- Add license tag
diff --git a/spotify-client.spec.in b/spotify-client.spec.in
index c40b942..36d934c 100644
--- a/spotify-client.spec.in
+++ b/spotify-client.spec.in
@@ -11,8 +11,8 @@
Name: spotify-client
-Version: 1.0.36.120.g536a862f
-Release: 2%{?dist}
+Version: 1.0.37.152.gc83ea995
+Release: 1%{?dist}
Summary: Spotify music player native client
# board=http://community.spotify.com/t5/Desktop-Linux
@@ -23,8 +23,8 @@ Group: Applications/Multimedia
ExclusiveArch: i386 i686 x86_64
Source0: spotify-make-%{shortcommit}.tar.gz
-Source1: %{repo}/spotify-client_%{version}-20_amd64.deb
-Source2: %{repo}/spotify-client_%{version}-2_i386.deb
+Source1: %{repo}/spotify-client_%{version}-42_amd64.deb
+Source2: %{repo}/spotify-client_%{version}-42_i386.deb
%ifarch x86_64
%global spotify_pkg %{SOURCE1}
@@ -115,6 +115,9 @@ fi
%changelog
+* Sun Sep 18 2016 Sérgio Basto <sergio(a)serjux.com> - 1.0.37.152.gc83ea995-1
+- Update to 1.0.37.152.gc83ea995_42
+
* Wed Aug 31 2016 Sérgio Basto <sergio(a)serjux.com> - 1.0.36.120.g536a862f-2
- Add license tag
8 years, 2 months
[qtav/f25: 2/2] Merge branch 'master' into f25
by Martin Gansser
commit 63772d958c0af38029e590f9daaba0b31c41985d
Merge: 7c1ff59 1148dbe
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Sep 17 20:15:04 2016 +0200
Merge branch 'master' into f25
qtav.spec | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
---
8 years, 2 months
