rpms/xorg-x11-drv-nv/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-drv-nv.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32464/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Log Message:
auto-import xorg-x11-drv-nv-1.2.2.1-4.fc7 on branch devel from xorg-x11-drv-nv-1.2.2.1-4.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Feb 2007 18:51:27 -0000	1.12
+++ .cvsignore	27 Feb 2007 20:08:05 -0000	1.13
@@ -1,2 +1,2 @@
 xf86-video-nv-1.2.2.1.tar.bz2
-nouveau-20070215.tar.bz2
+nouveau-20070227.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Feb 2007 18:51:27 -0000	1.12
+++ sources	27 Feb 2007 20:08:05 -0000	1.13
@@ -1,2 +1,2 @@
 e4dc415b1e45db0bbdacc203ed33024a  xf86-video-nv-1.2.2.1.tar.bz2
-3ea2ea093136be4ec356a2f91b7951ee  nouveau-20070215.tar.bz2
+f446b30aa8d444423a20e69e9833ccba  nouveau-20070227.tar.bz2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-drv-nv.spec	15 Feb 2007 18:51:27 -0000	1.31
+++ xorg-x11-drv-nv.spec	27 Feb 2007 20:08:05 -0000	1.32
@@ -2,14 +2,14 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070215
+%define gitdate 20070227
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.2.1
-Release:   3%{?dist}
+Release:   4%{?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)
 
@@ -44,8 +44,7 @@
 make
 
 pushd nouveau-%{gitdate}
-autoreconf -v --install #|| exit 1
-#aclocal ; automake -acf ; autoconf
+autoreconf -v --install
 %configure --disable-static
 make
 popd
@@ -59,8 +58,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $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 --
 
 %clean
@@ -68,17 +65,18 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/nouveau_drv.so
 %{driverdir}/nv_drv.so
 %{driverdir}/riva128.so
 %{_datadir}/hwdata/videoaliases/nv.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/nouveau.4*
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Feb 27 2007 Adam Jackson <ajax at redhat.com> 1.2.2.1-4
+- nouveau update: Fix a typo that would cause a crash if anyone was insane
+  enough to still be using an nv3 card.
+
 * Thu Feb 15 2007 Adam Jackson <ajax at redhat.com> 1.2.2.1-3
 - Initial nouveau driver build.  Utterly untested.