Accepting request 314490 from home:dimstar:Factory

- Fix the logic to ignore errors when applying
  acpica_remove_date_macro.patch: Kernel 4.1 has the patch, but we
  do want to keep it around for projects building against older
  kernels.

OBS-URL: https://build.opensuse.org/request/show/314490
OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=83

acpica.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 30 10:00:37 UTC 2015 - dimstar@opensuse.org
+
+- Fix the logic to ignore errors when applying
+  acpica_remove_date_macro.patch: Kernel 4.1 has the patch, but we
+  do want to keep it around for projects building against older
+  kernels.
+
 -------------------------------------------------------------------
 Fri Apr 24 08:58:34 UTC 2015 - trenn@suse.de
 

acpica.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package acpica
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -77,7 +77,7 @@ cd acpidump-%{dmp_ver}
 (cd /usr/src/linux ; tar -cf - COPYING CREDITS README tools include scripts Kbuild Makefile drivers/acpi lib) | tar -xf -
 # Supress error, if the patch does not patch, it is expected the version is
 # new enough and the patch already is in
-x=`patch -p1 -i %{SOURCE5}`
+patch -p1 -i %{SOURCE5} || :
 
 %build
 cc %{SOURCE1} %{optflags} -o ec_access