%bcond_without dkms # build dkms package
%bcond_without verbose
%bcond_without gui # disable Qt4 GUI frontend build
+%bcond_without host # build guest packages only
%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
%{error:kernel and userspace cannot be built at the same time on PLD builders}
%define _enable_debug_packages 0
%endif
-%define qtver 4.8.0
+%ifnarch %{x8664} %{?with_kernel:x32}
+%undefine with_host
+%endif
+
+%define qtver 5.6.0
%define rel 1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 5.0.4
+Version: 6.1.16
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 499abc66de7bb74a9117bda75e43ec4d
+# Source0-md5: a12a647f6c114f2cb1571089b36841fe
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 6bec1f5d0bf22841cad08b7973e95588
+# Source1-md5: 5710cdc38e4d7185b3df1c969b4cb267
Source2: vboxservice.init
Source3: vboxservice.service
+Source4: vboxservice.sysconfig
Source5: mount.vdi
Source6: udev.rules
Source7: %{pname}-virtualbox-host-modules-load.conf
Source8: %{pname}-virtualbox-guest-modules-load.conf
Source9: vboxautostart.init
Source10: autostart.cfg
+Source11: vboxclient-vmsvga.service
+Source12: udev-guest.rules
Patch0: %{pname}-version-error.patch
Patch1: %{pname}-VBoxSysInfo.patch
Patch2: %{pname}-warning_workaround.patch
-Patch3: %{pname}-dri.patch
Patch4: wrapper.patch
-Patch5: xserver-1.12.patch
Patch6: hardening-shared.patch
-Patch7: lightdm-greeter-glib-includes.patch
+Patch7: lightdm-greeter-makefile.patch
Patch8: lightdm-greeter-g++-link.patch
Patch9: pld-guest.patch
Patch10: 16-no-update.patch
-Patch11: 18-system-xorg.patch
-Patch12: %{pname}-all-translations.patch
-Patch13: x32.patch
-Patch14: %{pname}-no-scrextend.patch
-Patch15: %{pname}-cdefs.patch
+Patch11: %{pname}-all-translations.patch
+Patch12: x32.patch
+Patch13: %{pname}-no-scrextend.patch
+Patch14: %{pname}-multipython.patch
+Patch15: %{pname}-lightdm-1.19.2.patch
+Patch16: %{pname}-no-vboxvideo.patch
+Patch17: qt5-gl.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
BuildRequires: xorg-proto-glproto-devel
BuildRequires: xorg-xserver-server-devel
%endif
+BuildRequires: EGL-devel
BuildRequires: OpenGL-GLU-devel
BuildRequires: OpenGL-devel
-BuildRequires: QtCore-devel >= %{qtver}
-BuildRequires: QtGui-devel >= %{qtver}
-BuildRequires: QtNetwork-devel >= %{qtver}
-BuildRequires: QtOpenGL-devel >= %{qtver}
-BuildRequires: QtXml-devel >= %{qtver}
+BuildRequires: Qt5Core-devel >= %{qtver}
+BuildRequires: Qt5DBus-devel >= %{qtver}
+BuildRequires: Qt5Gui-devel >= %{qtver}
+BuildRequires: Qt5Network-devel >= %{qtver}
+BuildRequires: Qt5OpenGL-devel >= %{qtver}
+BuildRequires: Qt5PrintSupport-devel >= %{qtver}
+BuildRequires: Qt5Widgets-devel >= %{qtver}
+BuildRequires: Qt5X11Extras-devel >= %{qtver}
+BuildRequires: Qt5Xml-devel >= %{qtver}
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: acpica
BuildRequires: alsa-lib-devel >= 1.0.6
BuildRequires: gcc >= 5:3.2.3
%{?with_webservice:BuildRequires: gsoap-devel}
BuildRequires: issue
-BuildRequires: kBuild >= 0.1.9998.2700
+BuildRequires: kBuild >= 0.1.9998.3093
BuildRequires: libIDL-devel
BuildRequires: libcap-static
BuildRequires: libdrm-devel
BuildRequires: libxml2-devel >= 2.6.26
BuildRequires: libxslt-devel >= 1.1.17
BuildRequires: libxslt-progs >= 1.1.17
-%{?with_lightdm:BuildRequires: lightdm-libs-qt4-devel}
+%{?with_lightdm:BuildRequires: lightdm-libs-qt5-devel}
BuildRequires: makeself
BuildRequires: mkisofs
-BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: openssl-devel >= 1.0.1
BuildRequires: pam-devel
BuildRequires: pixman-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 0.9.0
BuildRequires: python-devel >= 2.3
BuildRequires: python-modules
-BuildRequires: qt4-build
-BuildRequires: qt4-linguist
-BuildRequires: rpmbuild(macros) >= 1.701
+BuildRequires: qt5-build
+BuildRequires: qt5-linguist
+BuildRequires: rpmbuild(macros) >= 1.715
BuildRequires: sed >= 4.0
%if %{with doc}
BuildRequires: texlive-fonts-bitstream
Requires: udev-core
Provides: group(vbox)
Obsoletes: VirtualBox-udev < 4.2.10-5
-ExclusiveArch: %{ix86} %{x8664} x32
+ExclusiveArch: %{ix86} %{x8664} %{?with_kernel:x32}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch %{x8664}
%define outdir out/%{vbox_platform}/release/bin
%define objdir out/%{vbox_platform}/release/obj
+%define filterout -Werror=format-security
+
+%define _noautochrpath .*\\.debug$
+
%description
Oracle VirtualBox is a general-purpose full virtualizer for x86
hardware. Targeted at server, desktop and embedded use, it is now the
Summary: Qt GUI part for VirtualBox
Group: X11/Applications
Requires: %{name} = %{version}-%{release}
-Requires: QtCore >= %{qtver}
+Requires: Qt5Core >= %{qtver}
+Requires: Qt5Gui-platform-xcb >= %{qtver}
Requires: desktop-file-utils
Requires: desktop-file-utils
Requires: fontconfig
Requires: gtk-update-icon-cache
Requires: hicolor-icon-theme
Requires: shared-mime-info
+Suggests: Qt5Gui-platform-xcb-glx >= %{qtver}
+Suggests: Qt5Gui-platform-xcb-egl >= %{qtver}
Suggests: gxmessage
Conflicts: %{name} < 4.3.8-3
Group: X11/Applications
Requires: %{name}-guest = %{version}-%{release}
Requires: xorg-app-xrandr
-Requires: xorg-driver-video-vboxvideo = %{version}-%{release}
-Suggests: kernel(vboxvideo)
+Requires: kernel(vboxvideo)
Obsoletes: xorg-driver-input-vboxmouse < %{version}-%{release}
+Obsoletes: xorg-driver-video-vboxvideo < %{version}-%{release}
%description guest-x11
Tools for X11 session that utilize kernel modules for supporting
PAM module (Pluggable Authentication Module) which can be used to
perform automated guest logons.
-%package -n xorg-driver-video-vboxvideo
-Summary: X.org video driver for VirtualBox guest OS
-Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie
-Group: X11/Applications
-Requires: Mesa-dri-driver-swrast
-Requires: xorg-xserver-libdri >= 1.7.4
-Requires: xorg-xserver-server >= 1.0.99.901
-%{?requires_xorg_xserver_videodrv}
-Provides: OpenGL = 2.1
-Provides: OpenGL-GLX = 1.3
-Provides: xorg-driver-video
-Provides: xorg-xserver-module(glx)
-
-%description -n xorg-driver-video-vboxvideo
-X.org video driver for VirtualBox guest OS.
-
-%description -n xorg-driver-video-vboxvideo -l pl.UTF-8
-Sterownik grafiki dla systemu gościa w VirtualBoksie.
-
%package -n dkms-vboxguest
Summary: VirtualBox kernel modules source for Linux Guest
Summary(pl.UTF-8): Moduły VirtualBoksa do jądra Linuksa dla systemu gościa
Requires(postun): %releq_kernel\
Provides: kernel(vboxguest) = %{version}-%{rel}\
Provides: kernel(vboxsf) = %{version}-%{rel}\
+%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
Provides: kernel(vboxvideo) = %{version}-%{rel}\
+%endif\
Obsoletes: kernel-init-guest\
Conflicts: kernel%{_alt_kernel}-virtualbox-host\
\
Provides: kernel(vboxdrv) = %{version}-%{rel}\
Provides: kernel(vboxnetadp) = %{version}-%{rel}\
Provides: kernel(vboxnetflt) = %{version}-%{rel}\
-Provides: kernel(vboxpci) = %{version}-%{rel}\
Obsoletes: kernel-init-host\
\
%description -n kernel%{_alt_kernel}-virtualbox-host\
%if %{with kernel}\
%files -n kernel%{_alt_kernel}-virtualbox-guest\
%defattr(644,root,root,755)\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
+%config(noreplace) %verify(not md5 mtime size) /etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\
/lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\
+%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
/lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*\
+%endif\
\
+%if %{with host}\
%files -n kernel%{_alt_kernel}-virtualbox-host\
%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-host.conf\
/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*\
/lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*\
-/lib/modules/%{_kernel_ver}/misc/vboxpci.ko*\
+%endif\
%endif\
\
%post -n kernel%{_alt_kernel}-virtualbox-guest\
%postun -n kernel%{_alt_kernel}-virtualbox-guest\
%depmod %{_kernel_ver}\
\
+%if %{with host}\
%post -n kernel%{_alt_kernel}-virtualbox-host\
%depmod %{_kernel_ver}\
\
%postun -n kernel%{_alt_kernel}-virtualbox-host\
%depmod %{_kernel_ver}\
+%endif\
%{nil}
%define build_kernel_pkg()\
export KERN_DIR=%{_kernelsrcdir}\
-cd PLD-MODULE-BUILD/HostDrivers\
+%if %{with host}\
+cd kernel/HostDrivers\
%build_kernel_modules -m vboxdrv -C vboxdrv\
-%build_kernel_modules -m vboxnetadp -C vboxnetadp\
-%build_kernel_modules -m vboxnetflt -C vboxnetflt\
-%build_kernel_modules -m vboxpci -C vboxpci\
-cd ../GuestDrivers\
+%build_kernel_modules -m vboxnetadp -C vboxnetadp KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
+%build_kernel_modules -m vboxnetflt -C vboxnetflt KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxdrv/vboxdrv,vboxnetadp/vboxnetadp,vboxnetflt/vboxnetflt -d misc\
+cd ../..\
+%endif\
+cd kernel/GuestDrivers\
%build_kernel_modules -m vboxguest -C vboxguest\
-cp -a vboxguest/Module.symvers vboxsf\
-%build_kernel_modules -m vboxsf -C vboxsf -c\
-%build_kernel_modules -m vboxvideo -C vboxvideo\
+%build_kernel_modules -m vboxsf -C vboxsf KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxsf/vboxsf,vboxguest/vboxguest -d misc\
+%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
+%build_kernel_modules -m vboxvideo -C vboxvideo KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxvideo/vboxvideo -d misc\
+%endif\
cd ../..\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv,PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp,PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt,PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci,PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf,PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
+%{nil}
+
+%define install_kernel_pkg()\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
+install -d kernel/installed/etc/depmod.d/%{_kernel_ver}\
+echo override vboxguest %{_kernel_ver} misc > kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 5 6 0}\
+echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
+%endif\
%{nil}
%{?with_kernel:%{expand:%create_kernel_packages}}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
%if %{with all_langs}
-%patch12 -p0
+%patch11 -p0
%endif
+%patch12 -p1
%patch13 -p1
-%patch14 -p1
+%patch14 -p0
%patch15 -p0
+%patch16 -p0
+%patch17 -p1
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
%{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' src/VBox/Installer/linux/VBox.sh
%if %{with kernel}
-install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
-cd PLD-MODULE-BUILD
-../src/VBox/Additions/linux/export_modules guest-modules.tar.gz
+install -d kernel/{GuestDrivers,HostDrivers}
+cd kernel
+../src/VBox/Additions/linux/export_modules.sh guest-modules.tar.gz
tar -zxf guest-modules.tar.gz -C GuestDrivers
-../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening
+../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz --without-hardening
tar -zxf host-modules.tar.gz -C HostDrivers
cd -
%endif
cat <<'EOF'>> LocalConfig.kmk
%{?with_verbose:KBUILD_VERBOSE=3}
USERNAME=%(id -un)
-__VBOX_BUILD_PUBLISHER=_PLD
+VBOX_BUILD_PUBLISHER=_PLD
VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD
XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR)
VBOX_USE_SYSTEM_XORG_HEADERS=1
+VBOX_USE_SYSTEM_GL_HEADERS=1
%if %{with lightdm}
VBOX_WITH_LIGHTDM_GREETER=1
VBOX_WITH_LIGHTDM_GREETER_PACKING=1
# don't build testcases to save time, they are not needed for the package
VBOX_WITH_TESTCASES :=
VBOX_WITH_TESTSUITE :=
+
+VBOX_WITH_VRDP_RDESKTOP=
+VBOX_WITH_MULTIVERSION_PYTHON=0
+%{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1}
+VBOX_WITH_VIRTIO=
EOF
%undefine filterout_c
--enable-vnc \
%{!?with_gui:--disable-qt} \
%{__enable webservice} \
+ %{!?with_host:--only-additions} \
%{nil}
+. "$PWD/env.sh"
kmk %{?_smp_mflags}
-
-%{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o mount.vboxsf
%endif
%{?with_kernel:%{expand:%build_kernel_packages}}
+%{?with_kernel:%{expand:%install_kernel_packages}}
%install
rm -rf $RPM_BUILD_ROOT
%if %{with userspace}
install -d $RPM_BUILD_ROOT{%{_bindir},/sbin,%{_sbindir},%{_libdir}/%{pname}/ExtensionPacks} \
$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_datadir}/mime/packages} \
+ $RPM_BUILD_ROOT/etc/sysconfig \
$RPM_BUILD_ROOT%{_sysconfdir}/vbox/autostart \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,dri,input} \
$RPM_BUILD_ROOT{/lib/udev,/etc/udev/rules.d} \
%{__rm} $RPM_BUILD_ROOT/COPYING
fi
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pname}
+
cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
-cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso ||
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
%if %{without gui}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml
%endif
-# vboxvideo
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
-# XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
-
# Guest Only Tools
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxDRMClient
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService
install -d $RPM_BUILD_ROOT/etc/xdg/autostart
cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT/etc/xdg/autostart/vboxclient.desktop
install -p src/VBox/Additions/x11/Installer/98vboxadd-xclient $RPM_BUILD_ROOT%{_bindir}/VBoxClient-all
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxservice
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/vboxservice
+
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/vboxclient-vmsvga.service
install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart
%{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart
%if %{with lightdm}
install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_sbindir}}/vbox-greeter
-cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters
+cp -p %{objdir}/Additions/Installer/linux/other/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters
%endif
%if %{with dkms}
%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
# mount.vboxsf
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
-install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
# mount.vdi
install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
-# scripts to setup modules, x11 and service. we have covered that in our packages
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-service
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-x11
+cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxguest.rules
+%if %{with host}
# unknown - checkme
%if 1
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/helpers/generate_service_file
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/load.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/loadall.sh
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/VBoxHeadlessXOrg.sh
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/init_template.sh
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install_service
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
%endif
-# use upstream installer to relocate rest of the files, fakeroot because it forces uid/gid 0
-fakeroot sh -x $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install.sh \
- --ose \
- --prefix %{_prefix} \
- %{!?with_webservice:--no-web-service} \
- %{!?with_gui:--no-qt} \
- --root $RPM_BUILD_ROOT
+cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso ||
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
+
+# manual installation steps based on src/VBox/Installer/linux/install.sh
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VirtualBox
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxManage
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxAutostart
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -sf %{_libdir}/%{pname}/vbox-img $RPM_BUILD_ROOT%{_bindir}/vbox-img
+ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxDTrace
+cp -p $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons/128x128/virtualbox.png $RPM_BUILD_ROOT%{_pixmapsdir}/virtualbox.png
+mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.desktop $RPM_BUILD_ROOT%{_desktopdir}/virtualbox.desktop
+mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/virtualbox.xml
+
+mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/nls $RPM_BUILD_ROOT%{_datadir}/%{pname}
+
+(
+cd $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
+for i in *; do
+cd $i
+ for j in *; do
+ if expr "$j" : "virtualbox\..*" > /dev/null; then
+ dst=apps
+ else
+ dst=mimetypes
+ fi
+ if [ ! -e $RPM_BUILD_ROOT%{_iconsdir}/hicolor/$i/$dst ]; then
+ install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/$i/$dst
+ fi
+ mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons/$i/$j $RPM_BUILD_ROOT%{_iconsdir}/hicolor/$i/$dst/$j
+ done
+cd -
+done
+)
+
+rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
-%{__mv} $RPM_BUILD_ROOT{%{_datadir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules
%if %{with dkms}
-mv $RPM_BUILD_ROOT%{_datadir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
-%{__rm} $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}_PLD
+mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
%endif
-# cleanup lowercased variants, not used in any script (less cruft)
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxautostart
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxheadless
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxmanage
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxsdl
-
# cleanup unpackaged
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{sdk,testcase}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/vboxapi*
%if %{with gui}
-# cleanup lowercased variants, not used in any script (less cruft)
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/virtualbox
# weird icon size
%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/40x40
%endif
# duplicate, we already have virtualbox.png (128x128), this is 32x32
-%{__rm} -r $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.png
%if %{with doc}
ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf
%endif
%endif
%endif
+%endif
%if %{with kernel}
install -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
-cp -a PLD-MODULE-BUILD/installed/* $RPM_BUILD_ROOT
+cp -a kernel/installed/* $RPM_BUILD_ROOT
# Tell systemd to load modules
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-host.conf
%update_mime_database
%pre guest
+%useradd -u 336 -d /usr/share/empty -s /bin/false -c "VirtualBox guest additions" -g nobody vboxadd
# Add a group "vboxsf" for Shared Folders access
# All users which want to access the auto-mounted Shared Folders have to be added to this group.
%groupadd -g 266 -r -f vboxsf
%post guest
/sbin/chkconfig --add vboxservice
%service vboxservice restart
-%systemd_post vboxservice.service
+%systemd_post vboxservice.service vboxclient-vmsvga.service
%preun guest
if [ "$1" = "0" ]; then
/sbin/chkconfig --del vboxservice
%service vboxservice -q stop
fi
-%systemd_preun vboxservice.service
+%systemd_preun vboxservice.service vboxclient-vmsvga.service
%postun guest
if [ "$1" = "0" ]; then
+ %userremove vboxadd
%groupremove vboxsf
fi
%systemd_reload
dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%if %{with userspace}
+%if %{with host}
%files
%defattr(644,root,root,755)
%dir %attr(751,root,root) %{_sysconfdir}/vbox
%attr(640,root,vbox) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vbox/autostart.cfg
%attr(754,root,root) /etc/rc.d/init.d/vboxautostart
%attr(755,root,root) /sbin/mount.vdi
-%attr(755,root,root) %{_bindir}/VBox
%attr(755,root,root) %{_bindir}/VBoxAutostart
%attr(755,root,root) %{_bindir}/VBoxBalloonCtrl
%attr(755,root,root) %{_bindir}/VBoxDTrace
%attr(755,root,root) %{_bindir}/VBoxHeadless
%attr(755,root,root) %{_bindir}/VBoxManage
%attr(755,root,root) %{_bindir}/VBoxSDL
-%attr(755,root,root) %{_bindir}/VBoxTunctl
+%attr(755,root,root) %{_bindir}/VBoxVRDP
%attr(755,root,root) %{_bindir}/vbox-img
%dir %{_libdir}/%{pname}
# libraries
%attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhostcrutil.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhosterrorspu.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLrenderspu.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxPython*.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxREM.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVGA3D.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so
%endif
# binaries
+%attr(755,root,root) %{_libdir}/%{pname}/VBox.sh
%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxDTrace
%attr(755,root,root) %{_libdir}/%{pname}/VBoxExtPackHelperApp
%attr(755,root,root) %{_libdir}/%{pname}/VBoxHeadless
%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD
+%attr(755,root,root) %{_libdir}/%{pname}/VirtualBoxVM
+%attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports
%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
+%attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount
%if %{with doc}
%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
%endif
%dir %{_libdir}/%{pname}/tools
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFTPServer
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTIsoMaker
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTKrnlModInfo
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrCheckImports
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrFlt
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLs
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTManifest
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTMkDir
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTRm
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTRmDir
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTShutdown
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTSignTool
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTTar
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTTraceLogTool
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTUnzip
%attr(755,root,root) %{_libdir}/%{pname}/tools/scm
%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.debug
%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.r0
+%{_libdir}/%{pname}/VBoxBugReport
%{_libdir}/%{pname}/VBoxCpuReport
-%{_libdir}/%{pname}/VBoxDD2R0.debug
-%{_libdir}/%{pname}/VBoxDD2R0.r0
-%{_libdir}/%{pname}/VBoxDD2RC.debug
-%{_libdir}/%{pname}/VBoxDD2RC.rc
-%{_libdir}/%{pname}/VBoxDDRC.debug
-%{_libdir}/%{pname}/VBoxDDRC.rc
%{_libdir}/%{pname}/VBoxDDR0.debug
%{_libdir}/%{pname}/VBoxDDR0.r0
%{_libdir}/%{pname}/VBoxEFI32.fd
%{_libdir}/%{pname}/VBoxEFI64.fd
-%{_libdir}/%{pname}/VMMRC.debug
-%{_libdir}/%{pname}/VMMRC.rc
%{_libdir}/%{pname}/VMMR0.debug
%{_libdir}/%{pname}/VMMR0.r0
%attr(755,root,root) %{_libdir}/%{pname}/components/VBoxC.so
%attr(755,root,root) %{_libdir}/%{pname}/components/VBoxSVCM.so
%attr(755,root,root) %{_libdir}/%{pname}/components/VBoxXPCOMIPCC.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxSysInfo.sh
+
+%{_libdir}/%{pname}/UnattendedTemplates
%dir %{_datadir}/%{pname}
-%attr(755,root,root) %{_datadir}/%{pname}/VBoxSysInfo.sh
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxdrv.rules
%attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh
%if %{with gui}
%files gui
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/VirtualBox
+%attr(755,root,root) %{_libdir}/%{pname}/UICommon.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
%attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
%lang(cs) %{_datadir}/%{pname}/nls/*_cs.qm
%lang(da) %{_datadir}/%{pname}/nls/*_da.qm
%lang(de) %{_datadir}/%{pname}/nls/*_de.qm
+%lang(en) %{_datadir}/%{pname}/nls/*_el.qm
%lang(en) %{_datadir}/%{pname}/nls/*_en.qm
%lang(es) %{_datadir}/%{pname}/nls/*_es.qm
%lang(eu) %{_datadir}/%{pname}/nls/*_eu.qm
-%lang(fi) %{_datadir}/%{pname}/nls/*_fa_IR.qm
+%lang(fa) %{_datadir}/%{pname}/nls/*_fa.qm
%lang(fi) %{_datadir}/%{pname}/nls/*_fi.qm
%lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm
-%lang(gl_ES) %{_datadir}/%{pname}/nls/*_gl_ES.qm
+%lang(gl) %{_datadir}/%{pname}/nls/*_gl.qm
+%lang(he) %{_datadir}/%{pname}/nls/*_he.qm
+%lang(hr) %{_datadir}/%{pname}/nls/*_hr_HR.qm
%lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm
%lang(id) %{_datadir}/%{pname}/nls/*_id.qm
%lang(it) %{_datadir}/%{pname}/nls/*_it.qm
%lang(ro) %{_datadir}/%{pname}/nls/*_ro.qm
%lang(ru) %{_datadir}/%{pname}/nls/*_ru.qm
%lang(sk) %{_datadir}/%{pname}/nls/*_sk.qm
+%lang(sk) %{_datadir}/%{pname}/nls/*_sl.qm
%lang(sr) %{_datadir}/%{pname}/nls/*_sr.qm
%lang(sv) %{_datadir}/%{pname}/nls/*_sv.qm
+%lang(th) %{_datadir}/%{pname}/nls/*_th.qm
%lang(tr) %{_datadir}/%{pname}/nls/*_tr.qm
%lang(uk) %{_datadir}/%{pname}/nls/*_uk.qm
%lang(zh_CN) %{_datadir}/%{pname}/nls/*_zh_CN.qm
%defattr(644,root,root,755)
%{_datadir}/%{pname}/VBoxGuestAdditions.iso
-%files guest
-%defattr(644,root,root,755)
-%attr(755,root,root) /sbin/mount.vboxsf
-%attr(754,root,root) /etc/rc.d/init.d/vboxservice
-%{systemdunitdir}/vboxservice.service
-%attr(755,root,root) %{_bindir}/VBoxControl
-%attr(755,root,root) %{_bindir}/VBoxService
-
-%files guest-x11
-%defattr(644,root,root,755)
-/etc/xdg/autostart/vboxclient.desktop
-%attr(755,root,root) %{_bindir}/VBoxClient
-%attr(755,root,root) %{_bindir}/VBoxClient-all
-
%if %{with webservice}
%files webservice
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{pname}/webtest
%endif
-%if %{with lightdm}
-%files -n lightdm-greeter-vbox
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/vbox-greeter
-%{_datadir}/xgreeters/vbox-greeter.desktop
-%endif
-
-%files -n pam-pam_vbox
-%defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/security/pam_vbox.so
-
%if %{with doc}
%files doc
%defattr(644,root,root,755)
%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
%endif
%endif
+%endif
-%files -n xorg-driver-video-vboxvideo
+%files guest
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so
-# vboxvideo_dri.so deps
-%attr(755,root,root) %{_libdir}/VBoxOGLarrayspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLcrutil.so
-%attr(755,root,root) %{_libdir}/VBoxOGLerrorspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLfeedbackspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLpackspu.so
-%attr(755,root,root) %{_libdir}/VBoxOGLpassthroughspu.so
+%attr(755,root,root) /sbin/mount.vboxsf
+%attr(754,root,root) /etc/rc.d/init.d/vboxservice
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vboxservice
+%{systemdunitdir}/vboxservice.service
+%{systemdunitdir}/vboxclient-vmsvga.service
+%attr(755,root,root) %{_bindir}/VBoxControl
+%attr(755,root,root) %{_bindir}/VBoxService
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxguest.rules
+
+%files guest-x11
+%defattr(644,root,root,755)
+/etc/xdg/autostart/vboxclient.desktop
+%attr(755,root,root) %{_bindir}/VBoxClient
+%attr(755,root,root) %{_bindir}/VBoxClient-all
+%attr(755,root,root) %{_bindir}/VBoxDRMClient
+
+%if %{with lightdm}
+%files -n lightdm-greeter-vbox
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/vbox-greeter
+%{_datadir}/xgreeters/vbox-greeter.desktop
+%endif
+
+%files -n pam-pam_vbox
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/security/pam_vbox.so
%if %{with dkms}
%files -n dkms-vboxguest
%defattr(644,root,root,755)
%{_usrsrc}/vboxguest-%{version}-%{rel}
+%if %{with host}
%files -n dkms-vboxhost
%defattr(644,root,root,755)
%{_usrsrc}/vboxhost-%{version}-%{rel}
%endif
%endif
+%endif