Accepting request 242867 from home:Andreas_Schwab:Factory

- Fix patch conflicts.

OBS-URL: https://build.opensuse.org/request/show/242867
OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=112
This commit is contained in:
Marcus Meissner 2014-07-30 09:36:40 +00:00 committed by Git OBS Bridge
parent a32108fd69
commit 0515c55030
2 changed files with 11 additions and 5 deletions

View File

@ -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 Wed Jun 18 15:08:53 UTC 2014 - dmueller@suse.com

View File

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