- rel 2; fixes from stable 7.4 branch

Changed files:
    Mesa.spec -> 1.196

diff --git a/Mesa.spec b/Mesa.spec
index a6eea55814e51104e0b85a8422655a2d5a873aff..728440d563cb12955f3a9a33529fc093e7501c31 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -17,7 +17,7 @@ Summary:      Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
 Version:       7.4
-Release:       1%{?with_multigl:.mgl}
+Release:       2%{?with_multigl:.mgl}
 License:       MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
@@ -25,6 +25,7 @@ Source0:      http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
 Source1:       http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
 # Source1-md5: 02816f10f30b1dc5e069e0f68c177c98
 Patch0:                %{name}-realclean.patch
+Patch1:                %{name}-git.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: expat-devel
 BuildRequires: libdrm-devel >= 2.4.5
@@ -583,6 +584,7 @@ Sterownik X.org DRI dla rodziny kart VIA Unichrome.
 %prep
 %setup -q -b1
 %patch0 -p0
+%patch1 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"