rpms/xorg-x11-drv-vmware/OLPC-2 Makefile, 1.1, 1.2 sources, 1.8, 1.9 xorg-x11-drv-vmware.spec, 1.12, 1.13

[Bernardo Innocenti (bernie)]

Author: bernie

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302

Modified Files:
	Makefile sources xorg-x11-drv-vmware.spec 
Log Message:
* Fri Dec 14 2007 Bernardo Innocenti <bernie at codewiz.org> - 10.15.2-2
- Rebuild for OLPC-2



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/OLPC-2/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	2 Oct 2005 14:44:40 -0000	1.1
+++ Makefile	14 Dec 2007 06:30:57 -0000	1.2
@@ -3,4 +3,19 @@
 NAME := xorg-x11-drv-vmware
 SPECFILE = $(firstword $(wildcard *.spec))
 
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/OLPC-2/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2007 23:23:08 -0000	1.8
+++ sources	14 Dec 2007 06:30:57 -0000	1.9
@@ -1 +1 @@
-eaf1ce9fa23363799140602afaa10f37  xf86-video-vmware-10.14.1.tar.bz2
+99322cbcc9081ad44e9cba63e3df8f7e  xf86-video-vmware-10.15.2.tar.bz2


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/OLPC-2/xorg-x11-drv-vmware.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-vmware.spec	5 Jan 2007 23:23:08 -0000	1.12
+++ xorg-x11-drv-vmware.spec	14 Dec 2007 06:30:57 -0000	1.13
@@ -2,14 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate xxxxxxx
-
 Summary:   Xorg X11 vmware video driver
 Name:      xorg-x11-drv-vmware
-Version:   10.14.1
-Release:   1%{?dist}
+Version:   10.15.2
+Release:   2%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,10 +16,12 @@
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+#bernie: should be a dependency of xorg-x11-server-sdk
+BuildRequires: pixman-devel
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+Requires:  hwdata
+Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
 %description 
 X.Org X11 vmware video driver.
@@ -50,14 +50,27 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/vmware_drv.so
 %{_datadir}/hwdata/videoaliases/vmware.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Fri Dec 14 2007 Bernardo Innocenti <bernie at codewiz.org> - 10.15.2-2
+- Rebuild for OLPC-2
+
+* Thu Oct 11 2007 Adam Jackson <ajax at redhat.com> 10.15.2-1
+- xf86-video-vmware 10.15.2
+
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 10.15.1-1
+- xf86-video-vmware 10.15.1
+
+* Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 10.14.1-3
+- Rebuild for build ID
+
+* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 10.14.1-2
+- Update Requires and BuildRequires.  Disown the module directories.  Add
+  Requires: hwdata.
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 10.14.1-1.fc7
 - Update to 10.14.1