diff --git a/valgrind-3.7.0-automake-1.11.2.patch b/valgrind-3.7.0-automake-1.11.2.patch new file mode 100644 index 0000000..74fcdfb --- /dev/null +++ b/valgrind-3.7.0-automake-1.11.2.patch @@ -0,0 +1,26 @@ +diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am +--- valgrind-3.7.0.orig/coregrind/Makefile.am 2011-10-27 12:55:06.000000000 +0200 ++++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-06 17:23:48.717115986 +0100 +@@ -495,7 +495,8 @@ + m_gdbserver/powerpc-altivec64l.xml + + # so as to make sure these get copied into the install tree +-pkglib_DATA = $(GDBSERVER_XML_FILES) ++vgdatadir = $(pkglibdir) ++vgdata_DATA = $(GDBSERVER_XML_FILES) + + # so as to make sure these get copied into the tarball + EXTRA_DIST += $(GDBSERVER_XML_FILES) +diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am +--- valgrind-3.7.0.orig/Makefile.am 2011-10-26 23:24:45.000000000 +0200 ++++ valgrind-3.7.0/Makefile.am 2012-01-06 17:23:17.445114847 +0100 +@@ -61,7 +61,8 @@ + # default.supp, as it is built from the base .supp files at compile-time. + dist_noinst_DATA = $(SUPP_FILES) + +-pkglib_DATA = default.supp ++vgdatadir = $(pkglibdir) ++vgdata_DATA = default.supp + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = valgrind.pc diff --git a/valgrind.changes b/valgrind.changes index bdfad9e..edb161c 100644 --- a/valgrind.changes +++ b/valgrind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 26 17:41:44 UTC 2012 - joop.boonen@opensuse.org + +- Added patch valgrind-3.7.0-automake-1.11.2.patch to fix automake issue + * See https://bugs.kde.org/show_bug.cgi?id=290719 + ------------------------------------------------------------------- Thu Dec 29 09:33:04 CET 2011 - dmueller@suse.de diff --git a/valgrind.spec b/valgrind.spec index 8a7ba00..01109ea 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -40,6 +40,8 @@ Source0: %{name}-%{version}.tar.bz2 # svn di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff Patch1: jit-register-unregister.diff Patch2: glibc-2.15.diff +# added automake 1.11.2 patch https://bugs.kde.org/show_bug.cgi?id=290719 algrind-3.7.0-automake-1.11.2.patch +Patch3: valgrind-3.7.0-automake-1.11.2.patch # during building the major version of glibc is built into the suppression file %define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1) %define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2) @@ -94,6 +96,7 @@ Authors: %package devel Summary: Memory Management Debugger +Group: Development/Tools/Debuggers Requires: %name = %version %description devel @@ -137,6 +140,7 @@ cd VEX cd .. %patch1 %patch2 +%patch3 -p1 %build %ifarch %arm