|
@@ -1,4 +1,4 @@
|
|
-%define version 4.1.4
|
|
|
|
|
|
+%define version 4.1.6
|
|
%define release 2%{?_dist_release}
|
|
%define release 2%{?_dist_release}
|
|
|
|
|
|
%define kname vboxdrv
|
|
%define kname vboxdrv
|
|
@@ -25,9 +25,13 @@
|
|
%define _provides_exceptions ^VBox
|
|
%define _provides_exceptions ^VBox
|
|
%define _requires_exceptions ^VBox
|
|
%define _requires_exceptions ^VBox
|
|
|
|
|
|
-%if %{?_dist_release} >= vl6
|
|
|
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
|
+%define xserverabi 111
|
|
|
|
+%endif
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
%define xserverabi 110
|
|
%define xserverabi 110
|
|
-%else
|
|
|
|
|
|
+%endif
|
|
|
|
+%if %{?_dist_release} == "vl5"
|
|
%define xserverabi 16
|
|
%define xserverabi 16
|
|
%endif
|
|
%endif
|
|
|
|
|
|
@@ -210,7 +214,7 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
|
|
%patch18 -p1 -b .mkisofs-makeself
|
|
%patch18 -p1 -b .mkisofs-makeself
|
|
#%patch50 -p1 -b .fix_panic
|
|
#%patch50 -p1 -b .fix_panic
|
|
%patch100 -p1 -b .buildfix
|
|
%patch100 -p1 -b .buildfix
|
|
-%patch101 -p1 -b .vboxpci-build
|
|
|
|
|
|
+#%patch101 -p1 -b .vboxpci-build
|
|
%patch110 -p1 -b .vine
|
|
%patch110 -p1 -b .vine
|
|
|
|
|
|
# remove prebuilt binaries
|
|
# remove prebuilt binaries
|
|
@@ -558,8 +562,15 @@ set -x
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Nov 5 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.6-2
|
|
|
|
+- explicitly specify xserverabi for vl5, vl6, vl7 (and up)
|
|
|
|
+
|
|
|
|
+* Sat Nov 5 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.6-1
|
|
|
|
+- new upstream release
|
|
|
|
+- drop Patch101 (merged into upstream)
|
|
|
|
+
|
|
* Mon Oct 31 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.4-2
|
|
* Mon Oct 31 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.4-2
|
|
-- fix the path of vboxadd script
|
|
|
|
|
|
+- fix the path 98vboxadd-xclient script should be installed
|
|
(s|/etc/X11/xinit.d|/etc/X11/xinit/xinitrc.d|)
|
|
(s|/etc/X11/xinit.d|/etc/X11/xinit/xinitrc.d|)
|
|
|
|
|
|
* Tue Oct 4 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.4-1
|
|
* Tue Oct 4 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.4-1
|