packages: VirtualBox/VirtualBox.spec - identify our build as _PLD, see http...

[glen]

Author: glen                         Date: Fri May 13 06:41:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- identify our build as _PLD, see http://www.virtualbox.org/wiki/Editions

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.364 -> 1.365) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.364 packages/VirtualBox/VirtualBox.spec:1.365
--- packages/VirtualBox/VirtualBox.spec:1.364	Mon Apr 25 23:03:32 2011
+++ packages/VirtualBox/VirtualBox.spec	Fri May 13 08:41:50 2011
@@ -7,6 +7,9 @@
 # - Package utils (and write initscripts ?) for Guest OS.
 # - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2.
 #   If so check if it is distributable.
+# - resolve mess with subpackages?
+#   - addtions: iso (containing additions/*.iso)
+#   - guest: to be installed to guests (deps on x11 drivers)
 #
 # Conditional build:
 %bcond_without	doc		# don't build the documentation
@@ -456,11 +459,13 @@
 	--disable-hardening \
 	--disable-kmods
 
+XSERVER_VERSION=$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel | awk -F. ' { print $1 $2 } ' 2> /dev/null || echo ERROR)
 . ./env.sh && \
 kmk -j1 \
 	%{?with_verbose:KBUILD_VERBOSE=3} \
 	USER=$(id -un) \
-	XSERVER_VERSION="$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel | awk -F. ' { print $1 $2 } ' 2> /dev/null || echo ERROR)"
+	VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
+	XSERVER_VERSION="$XSERVER_VERSION"
 %endif
 
 %if %{with kernel}
@@ -794,7 +799,7 @@
 %defattr(644,root,root,755)
 # NOTE: unfinished, should contain .desktop files for starting up mouse
 # integration and other desktop services
-# NOTE: the filelist is incopmplete too
+# NOTE: the filelist is incomplete too
 %attr(755,root,root) %{_bindir}/VBoxService
 
 %attr(755,root,root) %{_libdir}/VirtualBox/additions/autorun.sh
@@ -865,6 +870,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.365  2011/05/13 06:41:50  glen
+- identify our build as _PLD, see http://www.virtualbox.org/wiki/Editions
+
 Revision 1.364  2011/04/25 21:03:32  charles
 - mv {VBox,virtualbox}.png
 
================================================================

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