Merge branch 'f21' of ssh://pkgs.fedoraproject.org/mesa into f21

Conflicts:
	mesa.spec
This commit is contained in:
Karsten Hopp 2014-08-29 15:20:52 +02:00
commit aee649d1c0

View file

@ -29,7 +29,7 @@
%endif
%ifnarch s390 s390x %{power64} ppc
%define with_hardware 1
%define base_drivers nouveau,radeon,r200
%define base_drivers swrast,nouveau,radeon,r200
%ifarch %{ix86} x86_64
%define platform_drivers ,i915,i965
%define with_vmware 1
@ -55,7 +55,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 10.3
Release: 1.rc1.%{git}%{?dist}
Release: 0.rc1.2.%{git}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@ -677,10 +677,13 @@ rm -rf $RPM_BUILD_ROOT
# Generate changelog using:
# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
%changelog
* Fri Aug 29 2014 Karsten Hopp <karsten@redhat.com> 10.3-1.rc1.20140824
* Fri Aug 29 2014 Karsten Hopp <karsten@redhat.com> 10.3-0.rc1.2.20140824
- fix ppc64/ppc64le filelists
- fix missing include on bigendian
* Sun Aug 24 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc1.1.20140824
- add swrast to dri driver list
* Sun Aug 24 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc1.20140824
- 10.3-rc1