rpms/xorg-x11-drv-openchrome/devel xorg-x11-drv-openchrome.spec, 1.1, 1.2

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8496

Modified Files:
	xorg-x11-drv-openchrome.spec 
Log Message:
* Wed Nov 28 2007 Adam Jackson <ajax at redhat.com> 0.2.900-8
- Obsolete xorg-x11-drv-via.  The king is dead, long live the king.
- Munge xorg.conf in %post to change from via to openchrome.
- Drive-by spec cleanups.



Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-openchrome.spec	2 Nov 2007 16:32:18 -0000	1.1
+++ xorg-x11-drv-openchrome.spec	28 Nov 2007 16:00:33 -0000	1.2
@@ -6,16 +6,10 @@
 
 %define with_xvmc 1
 
-%ifarch %{ix86} x86_64
-%define with_dri 1
-%else
-%define with_dri 0
-%endif
-
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.900
-Release:	7%{?dist}
+Release:	8%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -39,11 +33,12 @@
 %if %{with_xvmc}
 BuildRequires:	libXvMC-devel
 %endif
-%if %{with_dri}
 BuildRequires:	libdrm-devel >= 2.0-1
-%endif
 Requires:	xorg-x11-server-Xorg
 
+Obsoletes:  xorg-x11-drv-via
+Provides:   xorg-x11-drv-via
+
 %description 
 X.Org X11 openchrome video driver.
 
@@ -64,12 +59,7 @@
 %patch3 -p0 -b .release
 
 %build
-%configure --disable-static \
-%if %{with_dri}
-	--enable-dri
-%else
-	--disable-dri
-%endif
+%configure --disable-static --enable-dri
 make
 
 %install
@@ -87,6 +77,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -e /etc/X11/xorg.conf ]; then
+    sed -i "/Driver/s/via/openchrome/" /etc/X11/xorg.conf || :
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc release_notes-0.3.0
@@ -109,6 +104,11 @@
 
 
 %changelog
+* Wed Nov 28 2007 Adam Jackson <ajax at redhat.com> 0.2.900-8
+- Obsolete xorg-x11-drv-via.  The king is dead, long live the king.
+- Munge xorg.conf in %%post to change from via to openchrome.
+- Drive-by spec cleanups.
+
 * Fri Nov 02 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-7
 - Replace broken VT1625 NTSC patch.
 - Add patch to announce as release not as development build.