packages: VirtualBox/VirtualBox.spec - added without doc bcond - cleanups

[charles]

Author: charles                      Date: Tue Dec 28 08:11:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added without doc bcond
- cleanups

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.334 -> 1.335) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.334 packages/VirtualBox/VirtualBox.spec:1.335
--- packages/VirtualBox/VirtualBox.spec:1.334	Mon Dec 27 15:41:34 2010
+++ packages/VirtualBox/VirtualBox.spec	Tue Dec 28 09:11:47 2010
@@ -9,6 +9,7 @@
 #   If so check if it is distributable.
 #
 # Conditional build:
+%bcond_without	doc		# don't build the documentation
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel module
 %bcond_without	userspace	# don't build userspace package
@@ -84,7 +85,7 @@
 BuildRequires:	bcc
 BuildRequires:	bin86
 BuildRequires:	curl-devel
-BuildRequires:	docbook-dtd44-xml
+%{?with_doc:BuildRequires:	docbook-dtd44-xml}
 BuildRequires:	gcc >= 5:3.2.3
 BuildRequires:	libIDL-devel
 BuildRequires:	libcap-static
@@ -106,10 +107,12 @@
 BuildRequires:	qt4-build >= 4.2.0
 BuildRequires:	qt4-linguist
 BuildRequires:	sed >= 4.0
+%if %{with doc}
 BuildRequires:	texlive-fonts-bitstream
 BuildRequires:	texlive-fonts-other
 BuildRequires:	texlive-fonts-type1-bitstream
 BuildRequires:	texlive-format-pdflatex
+%endif
 BuildRequires:	which
 BuildRequires:	xalan-c-devel >= 1.10.0
 BuildRequires:	xerces-c-devel >= 2.6.0
@@ -236,11 +239,7 @@
 Summary(pl.UTF-8):	Sterownik myszy dla systemu gościa w VirtualBoksie OSE
 Group:		X11/Applications
 Requires:	xorg-xserver-server >= 1.0.99.901
-%if "%{pld_release}" == "ti"
-Requires:	xorg-xserver-server(xinput-abi) <= 11.0
-%else
 Requires:	xorg-xserver-server(xinput-abi) <= 11.0
-%endif
 Requires:	xorg-xserver-server(xinput-abi) >= 4.0
 
 %description -n xorg-driver-input-vboxmouse
@@ -256,11 +255,7 @@
 Requires:	Mesa-dri-driver-swrast
 Requires:	xorg-xserver-libdri >= 1.7.4
 Requires:	xorg-xserver-server >= 1.0.99.901
-%if "%{pld_release}" == "ti"
-Requires:	xorg-xserver-server(videodrv-abi) <= 8.0
-%else
 Requires:	xorg-xserver-server(videodrv-abi) <= 8.0
-%endif
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 
 %description -n xorg-driver-video-vboxvideo
@@ -438,6 +433,7 @@
 ./configure \
 	--with-gcc="%{__cc}" \
 	--with-g++="%{__cxx}" \
+	%{!?with_doc:--disable-docs} \
 	--disable-java \
 	--disable-hardening \
 	--disable-kmods
@@ -487,13 +483,8 @@
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_pixmapsdir}}/VBox.png
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
 
-%if "%{pld_release}" == "ti"
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv_19.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_19.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
-%else
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv_19.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_19.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
-%endif
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 # xorg other driver versions
 rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so}
@@ -665,7 +656,7 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc %{outdir}/UserManual.pdf
+%{?with_doc:%doc %{outdir}/UserManual.pdf}
 %dir %{_libdir}/VirtualBox
 %dir %{_libdir}/VirtualBox/ExtensionPacks
 %dir %{_libdir}/VirtualBox/additions
@@ -857,6 +848,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.335  2010/12/28 08:11:47  charles
+- added without doc bcond
+- cleanups
+
 Revision 1.334  2010/12/27 14:41:34  glen
 - use existing macro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.334&r2=1.335&f=u