rpms/xorg-x11-drv-cirrus/OLPC-2 Makefile, 1.1, 1.2 xorg-x11-drv-cirrus.spec, 1.14, 1.15

[Bernardo Innocenti (bernie)]

Author: bernie

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

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



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/OLPC-2/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	2 Oct 2005 13:59:21 -0000	1.1
+++ Makefile	14 Dec 2007 05:48:09 -0000	1.2
@@ -3,4 +3,19 @@
 NAME := xorg-x11-drv-cirrus
 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: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/OLPC-2/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-cirrus.spec	15 Feb 2007 22:30:41 -0000	1.14
+++ xorg-x11-drv-cirrus.spec	14 Dec 2007 05:48:09 -0000	1.15
@@ -2,14 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate xxxxxxx
-
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.1.0
-Release:   3%{?dist}
+Release:   6%{?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,13 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cirrus.xinf
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-server-source
+#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 cirrus video driver.
@@ -30,6 +31,8 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
+CPPFLAGS='-I/usr/share/xorg-x11-server-source/hw/xfree86/xf1bpp -I/usr/share/xorg-x11-server-source/hw/xfree86/xf4bpp -I/usr/share/xorg-x11-server-source/mfb'
+export CPPFLAGS
 %configure --disable-static
 make
 
@@ -50,16 +53,23 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/cirrus_drv.so
 %{driverdir}/cirrus_alpine.so
 %{driverdir}/cirrus_laguna.so
 %{_datadir}/hwdata/videoaliases/cirrus.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Fri Dec 14 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1.0-6
+- Rebuild for OLPC-2
+
+* Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-5
+- Rebuild for PPC toolchain bug
+
+* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.0-4
+- Update Requires and BuildRequires.  Disown the module directories.  Add
+  Requires: hwdata.
+
 * Thu Feb 15 2007 Adam Jackson <ajax at redhat.com> 1.1.0-3
 - ExclusiveArch -> ExcludeArch