diff --git a/.gitignore b/.gitignore index 0b94f29..afb979c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ mesa-20100720.tar.bz2 /mesa-20101214.tar.xz /mesa-20101216.tar.xz /mesa-20110107.tar.xz +/MesaLib-7.10.1.tar.bz2 diff --git a/mesa.spec b/mesa.spec index c9f4bb1..b33ed88 100644 --- a/mesa.spec +++ b/mesa.spec @@ -14,15 +14,16 @@ Summary: Mesa graphics libraries Name: mesa -Version: 7.10 -Release: 0.30%{?dist} +Version: 7.10.1 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org #Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2 -Source0: %{name}-%{gitdate}.tar.xz +Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2 +#Source0: %{name}-%{gitdate}.tar.xz Source2: %{manpages}.tar.bz2 Source3: make-git-snapshot.sh Source4: llvmcore.mk @@ -214,8 +215,8 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide 2D driver for VMware SVGA vGPU %prep -#setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -%setup -q -n mesa-%{gitdate} -b2 +%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2 +#setup -q -n mesa-%{gitdate} -b2 %patch2 -p1 -b .intel-glthread %patch3 -p1 -b .no-mach64 %patch4 -p1 -b .classic @@ -330,7 +331,7 @@ done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || : # strip out undesirable headers pushd $RPM_BUILD_ROOT%{_includedir}/GL -rm [a-fh-np-wyz]*.h glf*.h glut*.h +rm -f [a-fh-np-wyz]*.h glf*.h glut*.h popd pushd $RPM_BUILD_ROOT%{_libdir} @@ -498,6 +499,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Wed Mar 23 2011 Adam Jackson 7.10.1-1 +- mesa 7.10.1 + * Fri Mar 18 2011 Dennis Gilmore 7.10-0.30 - fall back to non native jit on sparc. diff --git a/sources b/sources index 6cd32fc..4c1d96e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -c8c4d5be27e6e7c79b1a044cd40d8adc mesa-20110107.tar.xz +efe8da4d80c2a5d32a800770b8ce5dfa MesaLib-7.10.1.tar.bz2