rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.78,1.79

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17168

Modified Files:
	VirtualBox-OSE.spec 
Log Message:
* Sat Dec 24 2011 Sérgio Basto <sergio at serjux.com> - 4.1.8-2
- merge spec 4.0.4 from Lubomir Rintel <lkundrak at v3.sk>, which re-add BuildRequires: hal-devel on
  F-15



Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- VirtualBox-OSE.spec	23 Dec 2011 03:23:02 -0000	1.78
+++ VirtualBox-OSE.spec	24 Dec 2011 12:47:25 -0000	1.79
@@ -47,6 +47,9 @@
 
 BuildRequires:	kBuild >= 0.1.98
 BuildRequires:	SDL-devel xalan-c-devel
+%if 0%{?fedora} < 16
+BuildRequires: hal-devel
+%endif
 BuildRequires:	openssl-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel libXcomposite-devel
@@ -232,6 +235,7 @@
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
 
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
 	obj/bin/VBoxTunctl	\
@@ -409,21 +413,21 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/VBox
+%{_bindir}/vboxballoonctrl
 %{_bindir}/VBoxBalloonCtrl
+%{_bindir}/vboxbfe
 %{_bindir}/VBoxBFE
-%{_bindir}/VBoxHeadless
 %{_bindir}/vboxheadless
-%{_bindir}/VBoxManage
+%{_bindir}/VBoxHeadless
 %{_bindir}/vboxmanage
-%{_bindir}/VBoxSDL
+%{_bindir}/VBoxManage
 %{_bindir}/vboxsdl
+%{_bindir}/VBoxSDL
 %{_bindir}/VBoxTunctl
-%{_bindir}/VirtualBox
 %{_bindir}/virtualbox
+%{_bindir}/VirtualBox
 %{_bindir}/vboxwebsrv
 %{_bindir}/VBoxVRDP
-%{_bindir}/VBoxBalloonCtrl
-%{_bindir}/vboxballoonctrl
 %dir %{_libdir}/virtualbox
 %doc %{_libdir}/virtualbox/*.pdf
 %{_libdir}/virtualbox/*.[^p]*
@@ -492,6 +496,10 @@
 
 
 %changelog
+* Sat Dec 24 2011 Sérgio Basto <sergio at serjux.com> - 4.1.8-2
+- merge spec 4.0.4 from Lubomir Rintel <lkundrak at v3.sk>, which re-add BuildRequires: hal-devel on
+  F-15
+
 * Fri Dec 23 2011 Sérgio Basto <sergio at serjux.com> - 4.1.8-1
 - New release.
 - remove backported patch, compile_fixes, for reference https://www.virtualbox.org/ticket/9743.