- up to 7.12 snapshot

Changed files:
    Mesa.spec -> 1.263.2.26

diff --git a/Mesa.spec b/Mesa.spec
index c018974588aef1a0e6e705fe759f20a932bb5ed9..42d24195b545f7e4e9c8f9fe8c48e3cec1d1342a 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -25,15 +25,17 @@
 %define                dri2proto_ver   2.6
 %define                glproto_ver     1.4.11
 #
+%define                snap            20110801
+#
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
-Version:       7.11
-Release:       1%{?with_multigl:.mgl}
+Version:       7.12
+Release:       0.%{snap}.1%{?with_multigl:.mgl}
 License:       MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:         X11/Libraries
-Source0:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: ff03aca82d0560009a076a87c888cf13
+Source0:       %{name}Lib-%{snap}.tar.bz2
+# Source0-md5: 8cc8e0190bf633bf7d1cc727f8f368a8
 Patch0:                %{name}-realclean.patch
 Patch1:                %{name}-git.patch
 Patch2:                %{name}-selinux.patch
@@ -779,7 +781,6 @@ common_flags="\
        --enable-selinux \
        --enable-pic \
        --enable-glx-tls \
-       --disable-glut \
 %if %{with egl}
        --enable-egl \
        --enable-gles1 \
@@ -837,11 +838,6 @@ rm [a-fh-np-wyz]*.h glf*.h
 cd $RPM_BUILD_ROOT%{_libdir}
 cd $olddir
 
-%if %{with gallium}
-# use gallium swrastg as swrast
-mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrastg_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrast_dri.so
-%endif
-
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/Mesa,%{_sysconfdir}/ld.so.conf.d}