From b0bee4281219629c3623fed32cfb5ededcc4e600 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: May 02 2017 23:39:32 +0000
Subject: Correct update-big-endian.patch to replace logic in the proper order.


Signed-off-by: Al Stone <ahs3@redhat.com>

---

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 308f4d3..0cec80a 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20170303
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 Group:          Development/Languages
@@ -194,6 +194,10 @@ fi
 
 
 %changelog
+* Tue May 2 2017 Al Stone <ahs3@redhat.com> - 20170303-2
+- Correct update-big-endian.patch; it introduced a bug due to logic being
+  replaced in the wrong order.
+
 * Fri Mar 31 2017 Al Stone <ahs3@redhat.com> - 20170303-1
 - Update to latest upstream.  Closes BZ#1381017.
 - Refresh patches.
diff --git a/update-big-endian.patch b/update-big-endian.patch
index 0e93072..4cb1b6d 100644
--- a/update-big-endian.patch
+++ b/update-big-endian.patch
@@ -63,19 +63,6 @@ Index: acpica-unix2-20170303/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix2-20170303/source/common/ahpredef.c
-===================================================================
---- acpica-unix2-20170303.orig/source/common/ahpredef.c
-+++ acpica-unix2-20170303/source/common/ahpredef.c
-@@ -358,7 +358,7 @@ AcpiAhMatchPredefinedName (
-     char                        *Nameseg)
- {
-     const AH_PREDEFINED_NAME    *Info;
--
-+  
- 
-     for (Info = AslPredefinedInfo; Info->Name; Info++)
-     {
 Index: acpica-unix2-20170303/source/common/dmtable.c
 ===================================================================
 --- acpica-unix2-20170303.orig/source/common/dmtable.c
@@ -2814,7 +2801,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmopcode.c
      if (NameString[0] != '_')
      {
          return;
-@@ -884,25 +887,28 @@ AcpiDmDisassembleOneOp (
+@@ -884,25 +887,29 @@ AcpiDmDisassembleOneOp (
          AcpiDmNamestring (Op->Common.Value.Name);
          break;
  
@@ -2823,11 +2810,12 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmopcode.c
  
 -        Length = AcpiDmDumpName (Op->Named.Name);
 +	UINT32 TmpName;
++
++	ACPI_MOVE_32_TO_32(&TmpName, &Op->Named.Name);
++        Length = AcpiDmDumpName (TmpName);
  
          AcpiOsPrintf (",");
          ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
-+	ACPI_MOVE_32_TO_32(&TmpName, &Op->Named.Name);
-+        Length = AcpiDmDumpName (TmpName);
          AcpiOsPrintf ("%*.s  %u", (unsigned) (5 - Length), " ",
 -            (UINT32) Op->Common.Value.Integer);
 +            (UINT32) Op->Common.Value.Size);