summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@fedoraproject.org>2010-02-17 06:39:45 +0000
committerBen Skeggs <bskeggs@fedoraproject.org>2010-02-17 06:39:45 +0000
commitef30d831a89fba5b2ada618d62636e9f1ba05b2d (patch)
treeab4c4672b2beced331705981e452d5fb096d458f
parenta5551440937e751a682666c229549697d837f52d (diff)
downloadmesa-ef30d831a89fba5b2ada618d62636e9f1ba05b2d.tar.gz
mesa-ef30d831a89fba5b2ada618d62636e9f1ba05b2d.tar.xz
mesa-ef30d831a89fba5b2ada618d62636e9f1ba05b2d.zip
- rebase + rebuild for nouveau interface changes
-rw-r--r--.cvsignore2
-rw-r--r--mesa.spec11
-rw-r--r--sources2
3 files changed, 9 insertions, 6 deletions
diff --git a/.cvsignore b/.cvsignore
index 8ef3e0a..37fa213 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-mesa-20100208.tar.bz2
gl-manpages-1.0.1.tar.bz2
xdriinfo-1.0.3.tar.bz2
+mesa-20100217.tar.bz2
diff --git a/mesa.spec b/mesa.spec
index ef19516..3e231fe 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,7 +13,7 @@
%define manpages gl-manpages-1.0.1
%define xdriinfo xdriinfo-1.0.3
-%define gitdate 20100208
+%define gitdate 20100217
#% define snapshot
%define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.8
-Release: 0.16%{?dist}
+Release: 0.17%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -50,7 +50,7 @@ BuildRequires: pkgconfig autoconf automake
%if %{with_hardware}
BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
%endif
-BuildRequires: libdrm-devel >= 2.4.17-2
+BuildRequires: libdrm-devel >= 2.4.18-0.1
BuildRequires: libXxf86vm-devel
BuildRequires: expat-devel >= 2.0
BuildRequires: xorg-x11-proto-devel >= 7.4-35
@@ -76,7 +76,7 @@ Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides: libGL
Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
-Requires: libdrm >= 2.4.17-0.1
+Requires: libdrm >= 2.4.18-0.1
%if %{with_hardware}
Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
%endif
@@ -404,6 +404,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
%changelog
+* Wed Feb 17 2010 Ben Skeggs <bskeggs@redhat.com> 7.8-0.17
+- rebase + rebuild for nouveau interface changes
+
* Mon Feb 08 2010 Ben Skeggs <bskeggs@redhat.com> 7.8-0.16
- patch mesa to enable legacy nouveau driver build on i386
diff --git a/sources b/sources
index d6fff87..61e2611 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f20b37608e92e6add5984c804c92d85f mesa-20100208.tar.bz2
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
cb304d1ce562ac48b68eedeba38c662f xdriinfo-1.0.3.tar.bz2
+8141575e2adcf4f752fb4db94095ae2d mesa-20100217.tar.bz2