[xorg-x11-drv-nouveau] update to 1.0.0 release

[Ben Skeggs]

commit 85adf9487ec6563c37c0032481e7bbfe0559bf0e
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Mon Jun 18 16:28:09 2012 +1000

    update to 1.0.0 release

 .gitignore                |    1 +
 sources                   |    3 +--
 xorg-x11-drv-nouveau.spec |   35 +++++++++++++++++++----------------
 3 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e098b97..3d2be5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
 /xf86-video-nouveau-0.0.16-20110720gitb806e3f.tar.bz2
 /xf86-video-nouveau-0.0.16-20120306gitf5d1cd2.tar.bz2
 /xf86-video-nouveau-20120426.tar.xz
+/xf86-video-nouveau-1.0.0.tar.bz2
diff --git a/sources b/sources
index fe190d4..9dc6c66 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f5ed02fefb785bd5b3d38b7fb6200061  xf86-video-nouveau-0.0.16-20120306gitf5d1cd2.tar.bz2
-c4c45ebebba21c628da812cff0d6d69a  xf86-video-nouveau-20120426.tar.xz
+26c56ff4f373e6f48301ffaacfb3fe04  xf86-video-nouveau-1.0.0.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 0211e39..8531f40 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -1,31 +1,25 @@
 %define tarball xf86-video-nouveau
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
-%define nouveau_version 0.0.16
-
-# Tarfile created using git
-# git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
-# git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
-
-%define gitdate 20120426
-%define git_version 174f170
-
-%define snapshot %{gitdate}git%{git_version}
-
-%define tarfile %{tarball}-%{gitdate}.tar.xz
+#define gitdate 20120426
 
 Summary:   Xorg X11 nouveau video driver for NVIDIA graphics chipsets
 Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
-Version:   %{nouveau_version}
-Release:   39.%{snapshot}%{?dist}
+Version:   1.0.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 
 # Fedora specific snapshot no upstream release
-Source0:   %{tarfile}
+%if 0%{?gitdate}
+Source0: xf86-video-nouveau-%{gitdate}.tar.bz2
+%else
+Source0: http://nouveau.freedesktop.org/release/xf86-video-nouveau-%{version}.tar.bz2
+%endif
+Source1: make-git-snapshot.sh
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -47,8 +41,14 @@ Requires:  kernel-drm-nouveau = 16
 %description 
 X.Org X11 nouveau video driver.
 
+%if 0%{?gitdate}
+%define dirsuffix %{gitdate}
+%else
+%define dirsuffix %{version}
+%endif
+
 %prep
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n xf86-video-nouveau-%{dirsuffix}
 
 %build
 autoreconf -v --install
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Jun 18 2012 Ben Skeggs <bskeggs at redhat.com> 1.0.0-1
+- nouveau 1.0.0
+
 * Thu Jun 14 2012 Ben Skeggs <bskeggs at redhat.com> 0.0.16-39.20120426git174f170
 - Drop explicit Requires on libudev