rpms/xorg-x11-drv-nv/devel sources, 1.29, 1.30 xorg-x11-drv-nv.spec, 1.66, 1.67

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	sources xorg-x11-drv-nv.spec 
Log Message:
* Fri Feb 29 2008 Dave Airlie <airlied at redhat.com> 2.1.7-2
- drop nouveau sub-package



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	22 Feb 2008 18:54:28 -0000	1.29
+++ sources	29 Feb 2008 05:08:57 -0000	1.30
@@ -1,2 +1 @@
-00ba97f704d775c1ed83e104d4f089be  nouveau-20070920.tar.bz2
 192414222f1a98e228832ee53f8178c0  xf86-video-nv-2.1.7.tar.bz2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- xorg-x11-drv-nv.spec	22 Feb 2008 18:54:28 -0000	1.66
+++ xorg-x11-drv-nv.spec	29 Feb 2008 05:08:57 -0000	1.67
@@ -2,28 +2,22 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-# The snapshot is commit e0e90f427581929fd01c96f1958a1292982dee83,
-# verify tarball using bzip2 -cd <tarball> | git-get-tar-commit-id
-%define gitdate 20070920
-
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   nouveau-%{gitdate}.tar.bz2
-Source2:   nv.xinf
+Source1:   nv.xinf
 
 ExcludeArch: s390 s390x
 
 # XXX these two are temporary, remove soon.
 BuildRequires: pixman-devel libpciaccess-devel
-BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: libdrm-devel >= 2.3.0-7
 
@@ -31,9 +25,7 @@
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
 Patch0:     nv-1.1.1-nv34-tweaks.patch
-Patch1:     nouveau-fix-bswap32.patch
 Patch2:	    nv-2.1.6-alloca.patch
-Patch3:     nouveau-alloca.patch
 Patch4:     nv-reserve-fbarea.patch
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
@@ -41,14 +33,6 @@
 %description 
 X.Org X11 nv video driver.
 
-%package -n xorg-x11-drv-nouveau
-Summary:   Xorg X11 nouveau video driver
-Group:     User Interface/X Hardware Support
-Requires:  xorg-x11-server-Xorg >= 1.1.0-12
-Requires:  kernel-drm-nouveau = 10
-%description -n xorg-x11-drv-nouveau
-X.Org X11 nouveau video driver.
-
 %prep
 %setup -q -n %{tarball}-%{version}
 
@@ -58,33 +42,17 @@
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
 
-pushd ..
-tar jxf %{SOURCE1}
-cd nouveau-%{gitdate}
-#patch0 -p1 -b .nv34-tweak
-%patch1 -p1 -b .bswap32
-%patch3 -p1 -b .alloca
-popd
-
 %build
 %configure --disable-static
 make
 
-pushd ../nouveau-%{gitdate}
-autoreconf -v --install
-%configure --disable-static
-
-make
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-pushd ../nouveau-%{gitdate} && make install DESTDIR=$RPM_BUILD_ROOT && popd
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
@@ -98,12 +66,10 @@
 %{_datadir}/hwdata/videoaliases/nv.xinf
 %{_mandir}/man4/nv.4*
 
-%files -n xorg-x11-drv-nouveau
-%defattr(-,root,root,-)
-%{driverdir}/nouveau_drv.so
-%{_mandir}/man4/nouveau.4*
-
 %changelog
+* Fri Feb 29 2008 Dave Airlie <airlied at redhat.com> 2.1.7-2
+- drop nouveau sub-package
+
 * Fri Feb 22 2008 Adam Jackson <ajax at redhat.com> 2.1.7-1
 - nv 2.1.7