Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2014-07-31 10:04:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valgrind (Old) and /work/SRC/openSUSE:Factory/.valgrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valgrind" Changes: -------- --- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2014-06-26 08:00:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2014-07-31 10:04:17.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 26 18:02:35 UTC 2014 - schwab@suse.de + +- Fix patch conflicts. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.W6GOwW/_old 2014-07-31 10:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.W6GOwW/_new 2014-07-31 10:04:20.000000000 +0200 @@ -145,20 +145,21 @@ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org