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

[Karsten Hopp]

commit aee649d1c03cc57499362a932b60515e221e28d6
Merge: 354fc55 31c1e1a
Author: Karsten Hopp <karsten at redhat.com>
Date:   Fri Aug 29 15:20:52 2014 +0200

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

 mesa.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc mesa.spec
index d793a59,26e73a2..39816a9
--- a/mesa.spec
+++ b/mesa.spec
@@@ -27,9 -26,9 +27,9 @@@
  %define with_hardware 0
  %define base_drivers swrast
  %endif
 -%ifnarch s390 s390x ppc64le ppc
 +%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 -54,7 +55,7 @@@
  Summary: Mesa graphics libraries
  Name: mesa
  Version: 10.3
- Release: 1.rc1.%{git}%{?dist}
 -Release: 0.rc1.1.%{git}%{?dist}
++Release: 0.rc1.2.%{git}%{?dist}
  License: MIT
  Group: System Environment/Libraries
  URL: http://www.mesa3d.org
@@@ -677,10 -672,9 +677,13 @@@ rm -rf $RPM_BUILD_ROO
  # Generate changelog using:
  # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
  %changelog
- * Fri Aug 29 2014 Karsten Hopp <karsten at redhat.com> 10.3-1.rc1.20140824
++* Fri Aug 29 2014 Karsten Hopp <karsten at 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 at gmail.com> - 10.3-0.rc1.1.20140824
+ - add swrast to dri driver list
+ 
  * Sun Aug 24 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 10.3-0.rc1.20140824
  - 10.3-rc1