Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25610 Modified Files: VirtualBox-OSE.spec Log Message: * Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-4 - Rename to VirtualBox, rfbz #1826 Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- VirtualBox-OSE.spec 1 May 2012 06:09:44 -0000 1.95 +++ VirtualBox-OSE.spec 16 May 2012 02:25:44 -0000 1.96 @@ -3,7 +3,7 @@ %global systemd_dir /lib/systemd/system # Standard compiler flags, without: -# -Wall -- VirtualBox-OSE takes care of reasonable warnings very well +# -Wall -- VirtualBox takes care of reasonable warnings very well # -m32, -m64 -- 32bit code is built besides 64bit on x86_64 # -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0 %global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//') @@ -15,9 +15,9 @@ #global prerel beta3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -Name: VirtualBox-OSE +Name: VirtualBox Version: 4.1.14 -Release: 3%{?prerel:.%{prerel}}%{?dist} +Release: 4%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -95,8 +95,12 @@ Requires(preun): systemd-units Requires(postun): systemd-units +Provides: %{name}-OSE = %{version}-%{release} +Obsoletes: %{name}-OSE < %{version}-%{release} Requires: %{name}-kmod = %{version}%{?prereltag} Provides: %{name}-kmod-common = %{version}%{?prereltag} +Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} +Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} Conflicts: %{name}-guest <= %{version}-%{release} %description @@ -107,8 +111,10 @@ %package devel Summary: %{name} SDK Group: Development/Libraries -Requires: VirtualBox-OSE = %{version}-%{release} -Requires: python-VirtualBox-OSE = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: python-%{name} = %{version}-%{release} +Provides: %{name}-OSE-devel = %{version}-%{release} +Obsoletes: %{name}-OSE-devel < %{version}-%{release} %description devel %{name} Software Development Kit. @@ -117,7 +123,9 @@ %package -n python-%{name} Summary: Python bindings for %{name} Group: Development/Libraries -Requires: VirtualBox-OSE = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Provides: python-%{name}-OSE = %{version}-%{release} +Obsoletes: python-%{name}-OSE < %{version}-%{release} %description -n python-%{name} Python XPCOM bindings to %{name}. @@ -126,18 +134,24 @@ %package guest Summary: %{name} Guest Additions Group: System Environment/Base +Provides: %{name}-OSE-guest = %{version}-%{release} +Obsoletes: %{name}-OSE-guest < %{version}-%{release} Requires: %{name}-kmod = %{version} Provides: %{name}-kmod-common = %{version} +Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag} +Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag} Requires: xorg-x11-server-Xorg Requires: xorg-x11-xinit +Provides: xorg-x11-drv-VirtualBox = %{version}-%{release} +Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release} Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release} Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release} -Conflicts: %{name} <= %{version}-%{release} %if "%(xserver-sdk-abi-requires 2>/dev/null)" Requires: %(xserver-sdk-abi-requires ansic) Requires: %(xserver-sdk-abi-requires videodrv) Requires: %(xserver-sdk-abi-requires xinput) %endif +Conflicts: %{name} <= %{version}-%{release} %description guest @@ -157,7 +171,7 @@ %prep -%setup -q -n VirtualBox-%{version} +%setup -q find -name '*.py[co]' -delete %patch1 -p1 -b .noupdates @@ -530,6 +544,9 @@ %changelog +* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-4 +- Rename to VirtualBox, rfbz #1826 + * Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-3 - Review spec with fedora-review - Remove requirement for hal for F15