10:06 p.m.
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25705
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
vboxservice.service vboxweb.service
Log Message:
* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
- Review spec with fedora-review
- Remove requirement for hal for F15
- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
- don't try start vboxservice.service, because vboxservice.service depends on kmods,
maybe start when
modules are loaded.
* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
- Migrating vboxweb-service to a systemd unit file from a SysV initscript
- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
* Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1
- new release
- mesa patch only for F17 or higher
* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-3
- F17 mesa patch, fix compile fakedri and unbundle part of mesa sources, unbunble mesa
source must be tested.
--- NEW FILE vboxservice.service ---
[Unit]
Description=VirtualBox guest services
ConditionVirtualization=oracle
[Service]
ExecStart=/usr/bin/VBoxService -f
[Install]
WantedBy=multi-user.target
--- NEW FILE vboxweb.service ---
[Unit]
Description=VirtualBox OSE Web Service
After=network.target
[Service]
Type=forking
PIDFile=/run/vboxweb.pid
ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background
[Install]
WantedBy=multi-user.target
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 13 Apr 2012 04:54:00 -0000 1.33
+++ .cvsignore 6 May 2012 22:06:39 -0000 1.34
@@ -1 +1 @@
-VirtualBox-4.1.12.tar.bz2
+VirtualBox-4.1.14.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- VirtualBox-OSE.spec 13 Apr 2012 04:54:00 -0000 1.76
+++ VirtualBox-OSE.spec 6 May 2012 22:06:39 -0000 1.77
@@ -1,5 +1,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global systemd_dir /lib/systemd/system
+
# Standard compiler flags, without:
# -Wall -- VirtualBox-OSE takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
@@ -14,8 +16,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print
toupper("%{prerel}")}')}
Name: VirtualBox-OSE
-Version: 4.1.12
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.1.14
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -28,7 +30,8 @@
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
-Source10: vboxweb-service
+Source10: vboxweb.service
+Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-OSE-4.1.6-strings.patch
Patch3: VirtualBox-OSE-4.1.2-libcxx.patch
@@ -43,13 +46,11 @@
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
+Patch23: VirtualBox-OSE-4.1.10-mesa.patch
%if 0%{?fedora} < 17
BuildRequires: kBuild >= 0.1.98
%endif
-%if 0%{?fedora} < 16
-BuildRequires: hal-devel
-%endif
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
@@ -91,6 +92,8 @@
%endif
Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
@@ -125,9 +128,6 @@
Group: System Environment/Base
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
-%if 0%{?fedora} < 16
-Requires: hal
-%endif
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
@@ -141,6 +141,7 @@
%description guest
+This is the same that Guest Additions, therefore should only be installed on a guest
system.
Tools that utilize kernel modules for supporting integration
with the Host, including file sharing and tracking of mouse pointer
movement and X.org X11 video and mouse driver.
@@ -175,6 +176,9 @@
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
+%if 0%{?fedora} > 16
+%patch23 -p1 -b .mesa
+%endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 17
@@ -206,8 +210,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
-
# The directory layout created below attempts to mimic the one of
# the commercially supported version to minimize confusion
@@ -329,19 +331,22 @@
obj/bin/additions/VBoxControl
# Ideally, Xorg should autodetect this, but for some reason it no longer does
-install -m 0755 -D %{SOURCE9} \
+install -m 0644 -D %{SOURCE9} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
-install -m 0755 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_initrddir}/vboxweb-service
+install -m 0644 -D %{SOURCE10} \
+ $RPM_BUILD_ROOT%{systemd_dir}/vboxweb.service
+
+install -m 0644 -D %{SOURCE11} \
+ $RPM_BUILD_ROOT%{systemd_dir}/vboxservice.service
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
+install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-install -m 0755 -D %{SOURCE8} \
+install -m 0644 -D %{SOURCE8} \
$RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -389,7 +394,9 @@
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
# Web service
-/sbin/chkconfig --add vboxweb-service >/dev/null 2>&1 || :
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
@@ -402,25 +409,46 @@
%preun
-[ $1 = 0 ] && /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 ||
:
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable vboxweb.service > /dev/null 2>&1 || :
+ /bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
+fi
%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
/usr/bin/update-desktop-database &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# Guest additions install the OGL libraries
-%post guest -p /sbin/ldconfig
-%postun guest -p /sbin/ldconfig
+%post guest
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+
+%preun guest
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable vboxservice.service > /dev/null 2>&1 ||
:
+ /bin/systemctl stop vboxservice.service > /dev/null 2>&1 || :
+fi
+
+%postun guest
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
+fi
%files
-%defattr(-,root,root,-)
%{_bindir}/VBox
%{_bindir}/vboxballoonctrl
%{_bindir}/VBoxBalloonCtrl
@@ -466,22 +494,19 @@
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
-%attr(755,root,root) %{_initrddir}/vboxweb-service
+%{systemd_dir}/vboxweb.service
%files devel
-%defattr(0644,root,root,0755)
%{_libdir}/virtualbox/sdk
%files -n python-%{name}
-%defattr(0644,root,root,0755)
%{python_sitelib}/virtualbox
%{python_sitelib}/vboxapi*
%files guest
-%defattr(-,root,root,-)
/%{_lib}/security/pam_vbox.so
%{_bindir}/mount.vboxsf
%{_bindir}/VBoxClient
@@ -497,14 +522,32 @@
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
+%{systemd_dir}/vboxservice.service
%files kmodsrc
-%defattr(-,root,root,-)
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
+- Review spec with fedora-review
+- Remove requirement for hal for F15
+- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
+- don't try start vboxservice.service, because vboxservice.service depends on kmods,
maybe start when
+ modules are loaded.
+
+* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
+- Migrating vboxweb-service to a systemd unit file from a SysV initscript
+- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
+
+* Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1
+- new release
+- mesa patch only for F17 or higher
+
+* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-3
+- F17 mesa patch, fix compile fakedri and unbundle part of mesa sources, unbunble mesa
source must be tested.
+
* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-2
- F15 patch gsoap 2.7 which pkg-config gsoapssl++ --libs don't have -lssl -lcrypto
- F17 kBuild workarround, but still not build in F17,
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 13 Apr 2012 04:54:00 -0000 1.33
+++ sources 6 May 2012 22:06:39 -0000 1.34
@@ -1 +1 @@
-b6613e2b37562dec0fdede9af044edba VirtualBox-4.1.12.tar.bz2
+f8baa04e6d589bc6b1fb4e7079fbe414 VirtualBox-4.1.14.tar.bz2