3:58 p.m.
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8639
Modified Files:
VirtualBox-OSE.spec
Log Message:
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
- Correct permissions on SDK directories (#754)
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- VirtualBox-OSE.spec 9 Aug 2009 14:25:32 -0000 1.17
+++ VirtualBox-OSE.spec 9 Aug 2009 15:58:56 -0000 1.18
@@ -1,8 +1,10 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
# This is to prevent certain object files from being stripped.
# FIXME: We would not probably get useful information
# without utilizing optflags (see below)
# TODO: Remove executable bit temporarily to prevent stripping
-%define debug_package %{nil}
+%global debug_package %{nil}
# Lots of useless checks
# This will be enabled by default once RPM is built with caps enabled
@@ -10,7 +12,7 @@
Name: VirtualBox-OSE
Version: 3.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -77,13 +79,22 @@
%package devel
Summary: %{name} SDK
Group: Development/Libraries
-Requires: pyxpcom
Requires: VirtualBox-OSE = %{version}-%{release}
+Requires: python-VirtualBox-OSE = %{version}-%{release}
%description devel
%{name} Software Development Kit.
+%package -n python-%{name}
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: VirtualBox-OSE = %{version}-%{release}
+
+%description -n python-%{name}
+Python XPCOM bindings to %{name}.
+
+
%package guest
Summary: %{name} Guest Additions
Group: System Environment/Base
@@ -166,6 +177,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
+install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
# Binaries and Wrapper with Launchers
install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
@@ -213,6 +225,10 @@
# SDK
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
+mv $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom \
+ $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
+ln -sf ../../../../../../..%{python_sitelib}/virtualbox/xpcom \
+ $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
# Icon
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
@@ -257,7 +273,7 @@
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
-echo 'INSTALL_DIR="%{_libdir}/virtualbox"' >
$RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
+echo 'INSTALL_DIR=%{_libdir}/virtualbox' >
$RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
# Install udev rules
install -p -m 0644 -D %{SOURCE4}
$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
@@ -319,6 +335,13 @@
rm -rf $RPM_BUILD_ROOT
+%pre devel
+# This changed to a symlink from directory, which would cause
+# the new package's CPIO payload to fail to unpack unless removed
+PYXP=%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
+[ -d "$PYXP" ] && rm -rf "$PYXP"
+
+
# Guest additions install the OGL libraries
%post guest -p /sbin/ldconfig
%postun guest -p /sbin/ldconfig
@@ -343,9 +366,13 @@
%files devel
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
%{_datadir}/virtualbox
-%doc COPYING
+
+
+%files -n python-%{name}
+%defattr(0644,root,root,0755)
+%{python_sitelib}/virtualbox
%files guest
@@ -371,6 +398,11 @@
%changelog
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
+- Add python- subpackage
+- Correct permissions on SDK directories (#754)
+
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash