[acpica-tools/f19: 8/8] Merge branch 'master' into f19

Al Stone ahs3 at fedoraproject.org
Tue Nov 26 03:02:25 UTC 2013


commit 4163d84471cc5fe4ffb607fb0182ee671919f52a
Merge: d0090c0 a8d0038
Author: Al Stone <ahs3 at redhat.com>
Date:   Mon Nov 25 20:01:59 2013 -0700

    Merge branch 'master' into f19
    
    Conflicts:
    	acpica-tools.spec

 .gitignore              |    4 +++
 aapits-linux.patch      |   56 +++++++++++++++++++++++-----------------------
 acpica-tools.spec       |   17 ++++++++++++-
 debian-big_endian.patch |    6 ++--
 run-misc-tests.sh       |    8 ++++++-
 sources                 |    4 +-
 6 files changed, 59 insertions(+), 36 deletions(-)
---
diff --cc acpica-tools.spec
index 99a2a9f,0acaa6f..bc04f0a
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@@ -185,9 -185,19 +185,22 @@@ f
  
  
  %changelog
+ * Mon Nov 25 2013 Al Stone <ahs3 at redhat.com> - 20131115-1
+ - Update to latest upstream.  Closes BZ#1031255.
+ - Add a little code to workaround build problems that can occur (the tests
+   will fail) when a build starts before midnight, but ends after midnight
+ - Remove patch to include Makefile.config that was missing from tarball.
+ 
+ * Wed Oct 09 2013 Al Stone <ahs3 at redhat.com> - 20130927-1
+ - Update to latest upstream.  Closes BZ#1013090.
+ - Add temporary patch to include Makefile.config being missing from tarball.
+ 
 +* Tue Oct 08 2013 Al Stone <ahs3 at redhat.com> - 20130823-5
 +- correct iasl obs_ver (fixes BZ#1010971)
 +
+ * Fri Sep 13 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 20130823-5
+ - correct iasl obs_ver
+ 
  * Tue Sep 10 2013 Dean Nelson <dnelson at redhat.com> - 20130823-4
  - Fix run-misc-tests.sh script to properly set the number of BITS to 64
    when run on a s390x system.


More information about the scm-commits mailing list