diff --git a/.cvsignore b/.cvsignore index 95258c2..d76ed12 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-video-vmware-10.11.1.2.tar.bz2 +xf86-video-vmware-10.11.1.3.tar.bz2 diff --git a/sources b/sources index 43e727a..8a30f34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad489317b9a088fb6b0b91b56cab183d xf86-video-vmware-10.11.1.2.tar.bz2 +539b77e045a1767fdb64eee7c21d05d1 xf86-video-vmware-10.11.1.3.tar.bz2 diff --git a/vmware.xinf b/vmware.xinf new file mode 100644 index 0000000..caf6497 --- /dev/null +++ b/vmware.xinf @@ -0,0 +1,2 @@ +alias pcivideo:v000015ADd00000405sv*sd*bc*sc*i* vmware +alias pcivideo:v000015ADd00000710sv*sd*bc*sc*i* vmware diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec index 5b4686f..29d6825 100644 --- a/xorg-x11-drv-vmware.spec +++ b/xorg-x11-drv-vmware.spec @@ -1,22 +1,16 @@ %define tarball xf86-video-vmware -# All packages should own all dirs they lead up to, for saner -# rpm packaging, in particular if the leading dirs are not owned by -# the "filesystem" package. %define moduledir %(pkg-config xorg-server --variable=moduledir ) -# define driverdir to the appropriate type for this driver class %define driverdir %{moduledir}/drivers %define cvsdate xxxxxxx Summary: Xorg X11 vmware video driver Name: xorg-x11-drv-vmware -Version: 10.11.1.2 -Release: 1 +Version: 10.11.1.3 +Release: 1 URL: http://www.x.org -# FIXME: If using a CVS version, uncomment the second Source0 line and use -# it instead. -Source0: http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2 -#Source0: %{tarball}-%{version}-%{cvsdate}.tar.bz2 +Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2 +Source1: vmware.xinf License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,6 +21,7 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-server-sdk Requires: xorg-x11-server-Xorg + %description X.Org X11 vmware video driver. @@ -39,14 +34,15 @@ make %install rm -rf $RPM_BUILD_ROOT -# FIXME: This should be using makeinstall macro instead. Please test -# makeinstall with this driver, and if it works, check it into CVS. If -# it fails, fix it in upstream sources and file a patch upstream. + make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/ + # FIXME: Remove all libtool archives (*.la) from modules directory. This # should be fixed in upstream Makefile.am or whatever. -find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f -- +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- %clean rm -rf $RPM_BUILD_ROOT @@ -56,14 +52,14 @@ rm -rf $RPM_BUILD_ROOT %dir %{moduledir} %dir %{driverdir} %{driverdir}/vmware_drv.so -# NOTE: Uncomment when multimedia drivers are avail -#%dir %{moduledir}/multimedia -#%{moduledir}/multimedia/*.so -%dir %{_mandir} -%dir %{_mandir}/man4 -%{_mandir}/man4/*.4* +%{_datadir}/hwdata/videoaliases/vmware.xinf +#%dir %{_mandir}/man4x +%{_mandir}/man4/vmware.4* %changelog +* Wed Jan 18 2006 Mike A. Harris 10.11.1.3-1 +- Updated xorg-x11-drv-vmware to version 10.11.1.3 from X11R7.0 + * Tue Dec 20 2005 Mike A. Harris 10.11.1.2-1 - Updated xorg-x11-drv-vmware to version 10.11.1.2 from X11R7 RC4 - Removed 'x' suffix from manpage dirs to match RC4 upstream. @@ -74,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Nov 4 2005 Mike A. Harris 10.11.0.1-1 - Updated xorg-x11-drv-vmware to version 10.11.0.1 from X11R7 RC1 - Fix *.la file removal. + * Tue Oct 4 2005 Mike A. Harris 10.10.2-1 - Update BuildRoot to use Fedora Packaging Guidelines. - Deglob file manifest.