summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--mesa.spec45
2 files changed, 5 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore
index 49cfb90..a32210b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,4 @@ mesa-20100720.tar.bz2
/mesa-20131128.tar.xz
/mesa-20131206.tar.xz
/mesa-20131220.tar.xz
-/mesa-20140110.tar.xz
-/mesa-20140118.tar.xz
/mesa-20140206.tar.xz
diff --git a/mesa.spec b/mesa.spec
index 4ee71f5..e138671 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -636,48 +636,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Feb 06 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0.3-1.20140206
-- 10.0.3 upstream release
+- 10.0.3 upstream release (merged from rawhide)
-* Tue Feb 04 2014 Kyle McMartin <kyle@redhat.com> - 10.0.2-6.20140118
-- Fix accidentally inverted logic that meant radeonsi_dri.so went missing
- on all architectures instead of just ppc and s390. Sorry!
+* Fri Dec 20 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 9.2.5-1.20131220
+- 9.2.5 upstream release
-* Sun Feb 02 2014 Kyle McMartin <kyle@redhat.com> - 10.0.2-5.20140118
-- Fix a thinko in previous commit wrt libdrm_nouveau2.
-
-* Sun Feb 02 2014 Kyle McMartin <kyle@redhat.com> - 10.0.2-4.20140118
-- Fix up building drivers on AArch64, enable LLVM there.
-- Eliminate some F17 cruft from the spec, since we don't support it anymore.
-- Conditionalize with_radeonsi on with_llvm instead of ppc,s390 && >F-17.
-- Conditionalize libvdpau_radeonsi.so.1* on with_radeonsi instead of simply
- with_llvm to fix a build failure on AArch64.
-
-* Sun Jan 19 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0.2-3.20140118
-- Enable OpenCL (RHBZ #887628)
-- Enable r600 llvm compiler (RHBZ #1055098)
-
-* Tue Jan 14 2014 Dave Airlie <airlied@redhat.com> 10.0.2-2.20140110
-- rebuild for llvm 3.4
-
-* Fri Jan 10 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0.2-1.20140110
-- 10.0.2 upstream release
-
-* Fri Dec 20 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0.1-1.20131220
-- 10.0.1 upstream release
-
-* Wed Dec 18 2013 Peter Robinson <pbrobinson@fedoraproject.org> 10.0-4.20131206
-- use with_wayland for all wayland conditionals (instead of rhel)
-- don't build aarch64 with llvm support for now
-- fix aarch64 builds
-
-* Tue Dec 17 2013 Dave Airlie <airlied@redhat.com> 10.0-3.20131206
-- don't build aarch64 with hardware for now
-
-* Fri Dec 13 2013 Dave Airlie <airlied@redhat.com> 10.0-2.20131206
-- add software driver copy_sub_buffer support from upstream
-
-* Sun Dec 01 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.0-1.20131206
-- 10.0 upstream (RHBZ 1036361)
+* Fri Dec 13 2013 Dave Airlie <airlied@redhat.com> 9.2.4-2.20131128
+- backport the GLX_MESA_copy_sub_buffer from upstream for cogl
* Thu Nov 28 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 9.2.4-1.20131128
- 9.2.4 upstream release