From d1429af5e7b29ed563b6abe519e0a8d50ababf37 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Nov 18 2014 00:51:11 +0000
Subject: Update spec file, remove patch that is no longer needed


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

---

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 997ff55..a9a954d 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20140926
+Version:        20141107
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -30,8 +30,7 @@ Patch3:         aapits-linux.patch
 Patch4:         asllookup-miscompare.patch
 Patch5:         aapits-makefile.patch
 Patch6:		re-enable-big-endian.patch
-Patch7:		aslts-always-reports.patch
-Patch8:		OPT_LDFLAGS.patch
+Patch7:		OPT_LDFLAGS.patch
 
 BuildRequires:  bison patchutils flex
 
@@ -89,8 +88,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch4 -p1 -b .asllookup-miscompare
 %patch5 -p1 -b .aapits-makefile
 %patch6 -p1 -b .re-enable-big-endian
-%patch7 -p1 -b .aslts-always-reports
-%patch8 -p1 -b .OPT_LDFLAGS
+%patch7 -p1 -b .OPT_LDFLAGS
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -195,6 +193,12 @@ fi
 
 
 %changelog
+* Mon Nov 17 2014 Al Stone <ahs3@redhat.com> - 20141107-1
+- Update to latest upstream.  Closes BZ#1147131.
+- Refresh patches
+- Patch to ensure ASLTS always reports when an error occurs, instead
+  of glossing over it has been incorporated upstream, so remove patch.
+
 * Wed Oct 1 2014 Al Stone <ahs3@redhat.com> - 20140926-1
 - Update to latest upstream.  Closes BZ#1147131.
 - Refresh patches
diff --git a/aslts-always-reports.patch b/aslts-always-reports.patch
deleted file mode 100644
index d005983..0000000
--- a/aslts-always-reports.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From Dean Nelson <dnelson@redhat.com>
-
-Ensure that any errors found by iasl are actually reported by the
-ASLTS.  In the past, some were not and therefore just glossed over.
-
-diff --git a/tests/aslts/Makefile.def b/tests/aslts/Makefile.def
---- a/tests/aslts/Makefile.def
-+++ b/tests/aslts/Makefile.def
-@@ -72,7 +72,14 @@
- 				"$(ASL)" $$CUR_ASLFLAGS "$(COMMON_ASL_FLAGS)" $(ADD_ASLFLAGS) $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \
- 				ret=$$?; \
- 				echo "" >> $(COMPILER_LOG); \
--				if [ $$ret != 0 ]; then rval=1; echo "**** Unexpected iASL failure!"; exit 1; fi; \
-+                               if [ $$ret != 0 ]; then \
-+                                       rval=1; \
-+                                       echo "---- Test path: $$dd" >> /dev/stderr; \
-+                                       echo "---- Test type: $$CUR_AMLDIR   (Flags $(COMMON_ASL_FLAGS) $$CUR_ASLFLAGS $(ADD_ASLFLAGS))" >> /dev/stderr; \
-+                                       tail -2 $(COMPILER_LOG) >> /dev/stderr; \
-+                                       echo "**** Unexpected iASL failure!" >> /dev/stderr; \
-+                                       exit 1; \
-+                               fi; \
- 			done; \
- 			if [ $$ret != 0 ]; then break; fi; \
- 			for j in ${AMLMOD}; do \