Accepting request 242970 from devel:tools

1 OBS-URL: https://build.opensuse.org/request/show/242970 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=87
2014-07-31 08:04:08 +00:00
parent a6e61644ec 0515c55030
commit 9f0e71f565
2 changed files with 11 additions and 5 deletions
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jul 26 18:02:35 UTC 2014 - schwab@suse.de
+
+- Fix patch conflicts.
+
 -------------------------------------------------------------------
 Wed Jun 18 15:08:53 UTC 2014 - dmueller@suse.com

--- a/valgrind.spec
+++ b/valgrind.spec
@@ -145,20 +145,21 @@ Authors:
 cd VEX
 %ifarch aarch64
 %patch8
-%endif
+%else
 %patch9
+%endif
 cd ..
 %patch1
-%ifnarch aarch64
+%ifarch aarch64
+%patch7
+%else
 %patch2
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6
-%else
-%patch7
-%endif
 %patch10
+%endif

 %build
 %ifarch %arm