Accepting request 294246 from devel:tools

- Cleanup spec file with spec-cleaner - Update to 3.10.1 * bugfix release (for full list of solved issues see NEWS file) (forwarded request 294240 from pluskalm) OBS-URL: https://build.opensuse.org/request/show/294246 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=93
2015-04-05 22:25:22 +00:00 · 2015-04-05 22:25:22 +00:00 · dbbddec7e3
commit dbbddec7e3
parent f16fb0301a 321aae1516
7 changed files with 173 additions and 190 deletions
--- a/gcc-version.patch
+++ b/gcc-version.patch
@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
--- configure.ac.orig	2015-02-12 12:44:54.171760724 +0100
-+++ configure.ac	2015-02-12 12:45:05.779894998 +0100
+--- configure.ac.orig
+++ configure.ac
@@ -138,7 +138,7 @@ case "${is_clang}-${gcc_version}" in
      notclang-4.*)
 	AC_MSG_RESULT([ok (${gcc_version})])
--- a/glibc-version.patch
+++ b/glibc-version.patch
@ -1,7 +1,7 @@
-Index: valgrind-3.10.0/configure.ac
+Index: valgrind-3.10.1/configure.ac
 ===================================================================
--- valgrind-3.10.0.orig/configure.ac
-+++ valgrind-3.10.0/configure.ac
+--- valgrind-3.10.1.orig/configure.ac
+++ valgrind-3.10.1/configure.ac
@@ -1018,6 +1018,13 @@ case "${GLIBC_VERSION}" in
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
--- a/jit-register-unregister.diff
+++ b/jit-register-unregister.diff
@ -1,7 +1,8 @@
-diff -u -r ../valgrind-3.9.0.orig/coregrind/m_debuginfo/debuginfo.c ./coregrind/m_debuginfo/debuginfo.c
--- ../valgrind-3.9.0.orig/coregrind/m_debuginfo/debuginfo.c	2013-10-23 12:50:10.000000000 +0200
-+++ ./coregrind/m_debuginfo/debuginfo.c	2013-11-06 20:42:17.248338211 +0100
-@@ -49,6 +49,7 @@
+Index: coregrind/m_debuginfo/debuginfo.c
+===================================================================
+--- coregrind/m_debuginfo/debuginfo.c.orig
+++ coregrind/m_debuginfo/debuginfo.c
+@@ -50,6 +50,7 @@
 #include "pub_core_oset.h"
 #include "pub_core_stacktrace.h" // VG_(get_StackTrace) XXX: circular dependency
 #include "pub_core_ume.h"
@ -9,7 +10,7 @@ diff -u -r ../valgrind-3.9.0.orig/coregrind/m_debuginfo/debuginfo.c ./coregrind/
 
 #include "priv_misc.h"           /* dinfo_zalloc/free */
 #include "priv_image.h"
-@@ -1272,6 +1273,132 @@
+@@ -1319,6 +1320,132 @@ void VG_(di_notify_pdb_debuginfo)( Int f
 #endif /* defined(VGO_linux) || defined(VGO_darwin) */
 
 
@ -142,7 +143,7 @@ diff -u -r ../valgrind-3.9.0.orig/coregrind/m_debuginfo/debuginfo.c ./coregrind/
 /*------------------------------------------------------------*/
 /*---                                                      ---*/
 /*--- TOP LEVEL: QUERYING EXISTING DEBUG INFO              ---*/
-@@ -1430,8 +1557,19 @@
+@@ -1638,8 +1765,19 @@ Bool get_sym_name ( Bool do_cxx_demangli
    PtrdiffT   offset;
 
    search_all_symtabs ( a, &di, &sno, match_anywhere_in_sym, findText );
@ -163,10 +164,11 @@ diff -u -r ../valgrind-3.9.0.orig/coregrind/m_debuginfo/debuginfo.c ./coregrind/
 
    vg_assert(di->symtab[sno].pri_name);
    VG_(demangle) ( do_cxx_demangling, do_z_demangling,
-diff -u -r ../valgrind-3.9.0.orig/coregrind/m_scheduler/scheduler.c ./coregrind/m_scheduler/scheduler.c
--- ../valgrind-3.9.0.orig/coregrind/m_scheduler/scheduler.c	2013-10-23 12:50:12.000000000 +0200
-+++ ./coregrind/m_scheduler/scheduler.c	2013-11-06 20:42:17.248338211 +0100
-@@ -1980,6 +1980,16 @@
+Index: coregrind/m_scheduler/scheduler.c
+===================================================================
+--- coregrind/m_scheduler/scheduler.c.orig
+++ coregrind/m_scheduler/scheduler.c
+@@ -2062,6 +2062,16 @@ void do_client_request ( ThreadId tid )
          LibVEX_InitIRI ( (IRICB *)arg[1] );
          break;
 
@ -183,10 +185,11 @@ diff -u -r ../valgrind-3.9.0.orig/coregrind/m_scheduler/scheduler.c ./coregrind/
       default:
        my_default:
 	 if (os_client_request(tid, arg)) {
-diff -u -r ../valgrind-3.9.0.orig/coregrind/pub_core_debuginfo.h ./coregrind/pub_core_debuginfo.h
--- ../valgrind-3.9.0.orig/coregrind/pub_core_debuginfo.h	2013-10-23 12:50:09.000000000 +0200
-+++ ./coregrind/pub_core_debuginfo.h	2013-11-06 20:42:17.248338211 +0100
-@@ -99,6 +99,12 @@
+Index: coregrind/pub_core_debuginfo.h
+===================================================================
+--- coregrind/pub_core_debuginfo.h.orig
+++ coregrind/pub_core_debuginfo.h
+@@ -101,6 +101,12 @@ Bool VG_(get_fnname_no_cxx_demangle) ( A
 extern
 Bool VG_(get_inst_offset_in_function)( Addr a, /*OUT*/PtrdiffT* offset );
 
@ -199,10 +202,11 @@ diff -u -r ../valgrind-3.9.0.orig/coregrind/pub_core_debuginfo.h ./coregrind/pub
 
 /* Use DWARF2/3 CFA information to do one step of stack unwinding.
    D3UnwindRegs holds the current register values, and is
-diff -u -r ../valgrind-3.9.0.orig/include/valgrind.h ./include/valgrind.h
--- ../valgrind-3.9.0.orig/include/valgrind.h	2013-10-23 12:49:54.000000000 +0200
-+++ ./include/valgrind.h	2013-11-06 20:42:17.249338211 +0100
-@@ -5001,6 +5001,10 @@
+Index: include/valgrind.h
+===================================================================
+--- include/valgrind.h.orig
+++ include/valgrind.h
+@@ -6170,6 +6170,10 @@ typedef
           /* Querying of debug info. */
           VG_USERREQ__MAP_IP_TO_SRCLOC = 0x1701,
 
@ -213,7 +217,7 @@ diff -u -r ../valgrind-3.9.0.orig/include/valgrind.h ./include/valgrind.h
           /* Disable/enable error reporting level.  Takes a single
              Word arg which is the delta to this thread's error
              disablement indicator.  Hence 1 disables or further
-@@ -5168,6 +5172,19 @@
+@@ -6337,6 +6341,19 @@ VALGRIND_PRINTF_BACKTRACE(const char *fo
                                     _qyy_arg1, _qyy_arg2,               \
                                     _qyy_arg3, 0)
 
--- a/valgrind-3.10.0.tar.bz2
+++ b/valgrind-3.10.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03047f82dfc6985a4c7d9d2700e17bc05f5e1a0ca6ad902e5d6c81aeb720edc9
-size 10898253
--- a/valgrind-3.10.1.tar.bz2
+++ b/valgrind-3.10.1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997
+size 10967905
--- a/valgrind.changes
+++ b/valgrind.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  2 18:07:55 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Update to 3.10.1
+  * bugfix release (for full list of solved issues see NEWS file)
+
 -------------------------------------------------------------------
 Thu Feb 12 11:46:20 UTC 2015 - rguenther@suse.com

--- a/valgrind.spec
+++ b/valgrind.spec
@ -1,7 +1,7 @@
 #
 # spec file for package valgrind
 #
-# 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
@ -16,25 +16,21 @@
 #


-Name:           valgrind
-BuildRequires:  automake
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  docbook_4
-BuildRequires:  gcc-c++
-BuildRequires:  glibc-devel-32bit
-BuildRequires:  libxslt
-BuildRequires:  pkgconfig
-%ifarch x86_64 ppc64
-BuildRequires:  gcc-32bit
-BuildRequires:  glibc-devel-32bit
+# 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)
+%if 0%{?suse_version} > 1100
+%define building_docs 1
+%else
+%define building_docs 0
 %endif
-Url:            http://valgrind.org/
+Name:           valgrind
+Version:        3.10.1
+Release:        0
 Summary:        Memory Management Debugger
 License:        GPL-2.0+
 Group:          Development/Tools/Debuggers
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Version:        3.10.0
-Release:        0
+Url:            http://valgrind.org/
 Source0:        http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
 # svn  di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_5_0 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_5_BRANCH > 3_5_BRANCH.diff
 # 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
@ -42,21 +38,25 @@ Patch1:         jit-register-unregister.diff
 Patch2:         armv6-support.diff
 Patch3:         glibc-version.patch
 Patch4:         gcc-version.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)
-Requires:       glibc >= %glibc_main_version.%glibc_major_version
-Requires:       glibc < %glibc_main_version.%{lua:print(rpm.expand("%glibc_major_version")+1)}
-%if %suse_version <= 1100
-Provides:       valgrind-devel = %version
-%endif
-Provides:       callgrind = %version
-Obsoletes:      callgrind < %version
+BuildRequires:  automake
+BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  docbook_4
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel-32bit
+BuildRequires:  libxslt
+BuildRequires:  pkgconfig
+Requires:       glibc >= %{glibc_main_version}.%{glibc_major_version}
+Requires:       glibc < %{glibc_main_version}.%{lua:print(rpm.expand("%{glibc_major_version}")+1)}
+Provides:       callgrind = %{version}
+Obsoletes:      callgrind < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  aarch64 %ix86 x86_64 ppc ppc64 ppc64le s390x armv7l armv7hl armv6l armv6hl
-%if %suse_version > 1100
-%define building_docs 1
-%else
-%define building_docs 0
+%ifarch x86_64 ppc64
+BuildRequires:  gcc-32bit
+BuildRequires:  glibc-devel-32bit
+%endif
+%if 0%{?suse_version} <= 1100
+Provides:       valgrind-devel = %{version}
 %endif

 %description
@ -74,30 +74,16 @@ valgrind --tool=memcheck --sloppy-malloc=yes --leak-check=yes
 --db-attach=yes my_application, for example.

 More valgrind options can be listed via "valgrind --help". There is
-also complete documentation in the /usr/share/doc/packages/valgrind/
+also complete documentation in the %{_docdir}/valgrind/
 directory. A debugged application runs slower and needs much more
 memory, but is usually still usable. Valgrind is still in development,
 but it has been successfully used to optimize several KDE applications.

-
-
-Authors:
--------
-    Julian Seward <jseward@acm.org>
-    Cerion Armour-Brown
-    Jeremy Fitzhardinge
-    Tom Hughes
-    Nicholas Nethercote
-    Paul Mackerras
-    Dirk Mueller
-    Robert Walsh
-
-%if %suse_version > 1100
-
+%if 0%{?suse_version} > 1100
 %package devel
 Summary:        Memory Management Debugger
 Group:          Development/Tools/Debuggers
-Requires:       %name = %version
+Requires:       %{name} = %{version}

 %description devel
 Valgrind checks all memory operations in an application, like read,
@ -114,28 +100,15 @@ valgrind --tool=memcheck --sloppy-malloc=yes --leak-check=yes
 --db-attach=yes my_application, for example.

 More valgrind options can be listed via "valgrind --help". There is
-also complete documentation in the /usr/share/doc/packages/valgrind/
+also complete documentation in the %{_docdir}/valgrind/
 directory. A debugged application runs slower and needs much more
 memory, but is usually still usable. Valgrind is still in development,
 but it has been successfully used to optimize several KDE applications.

-
-
-Authors:
--------
-    Julian Seward <jseward@acm.org>
-    Cerion Armour-Brown
-    Jeremy Fitzhardinge
-    Tom Hughes
-    Nicholas Nethercote
-    Paul Mackerras
-    Dirk Mueller
-    Robert Walsh
-
 %endif

 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch1
 %patch2
 %patch3 -p1
@ -149,19 +122,19 @@ RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-mthumb/-mthumb-interwork -marm}
 %endif
 # not a good idea to build valgrind with fortify, as it does not link glibc
 RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-D_FORTIFY_SOURCE=2/}"
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-%if %suse_version > 1100
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+%if 0%{?suse_version} > 1100
 autoreconf -fi
 %endif
-export GDB=/usr/bin/gdb
+export GDB=%{_bindir}/gdb
 %configure \
 %ifarch aarch64
           --enable-only64bit
 %endif

-make %{?jobs:-j%jobs}
-%if %building_docs
+make %{?_smp_mflags}
+%if %{building_docs}
 pushd docs
    #make all-docs
    # building the docs needs network access at the moment :-(
@ -170,124 +143,123 @@ popd
 %endif

 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%_defaultdocdir
-if test -d $RPM_BUILD_ROOT/usr/share/doc/valgrind; then
-     mv $RPM_BUILD_ROOT/usr/share/doc/valgrind $RPM_BUILD_ROOT/%_defaultdocdir
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+mkdir -p %{buildroot}/%{_defaultdocdir}
+if test -d %{buildroot}%{_datadir}/doc/valgrind; then
+     mv %{buildroot}%{_datadir}/doc/valgrind %{buildroot}/%{_defaultdocdir}
 fi
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%name
-cp -a README* NEWS AUTHORS COPYING COPYING.DOCS $RPM_BUILD_ROOT/%_defaultdocdir/%name
+mkdir -p %{buildroot}%{_docdir}/%{name}
+cp -a README* NEWS AUTHORS COPYING COPYING.DOCS %{buildroot}/%{_defaultdocdir}/%{name}

 %files
 %defattr(-,root,root)
-/usr/bin/*
-%doc %_defaultdocdir/%name
-%doc %_mandir/*/*
-%dir %_libdir/valgrind
+%{_bindir}/*
+%doc %{_defaultdocdir}/%{name}
+%doc %{_mandir}/*/*
+%dir %{_libdir}/valgrind
 %ifarch aarch64
-%_libdir/valgrind/*-arm64-linux
+%{_libdir}/valgrind/*-arm64-linux
 %endif
 %ifarch x86_64
-%_libdir/valgrind/*-amd64-linux
+%{_libdir}/valgrind/*-amd64-linux
 %endif
 %ifarch %ix86 x86_64
-%_libdir/valgrind/*-x86-linux
+%{_libdir}/valgrind/*-x86-linux
 %endif
 %ifarch ppc ppc64
-%_libdir/valgrind/*-ppc32-linux
+%{_libdir}/valgrind/*-ppc32-linux
 %endif
 %ifarch ppc64
-%_libdir/valgrind/*-ppc64be-linux
+%{_libdir}/valgrind/*-ppc64be-linux
 %endif
 %ifarch ppc64le
-%_libdir/valgrind/*-ppc64le-linux
+%{_libdir}/valgrind/*-ppc64le-linux
 %endif
 %ifarch s390x
-%_libdir/valgrind/*-s390x-linux
+%{_libdir}/valgrind/*-s390x-linux
 %endif
 %ifarch %arm
-%_libdir/valgrind/*-arm-linux
+%{_libdir}/valgrind/*-arm-linux
 %endif
-%_libdir/valgrind/*-linux.so
-%_libdir/valgrind/*.supp
-%_libdir/valgrind/32bit-core.xml
-%_libdir/valgrind/32bit-linux.xml
-%_libdir/valgrind/32bit-sse.xml
-%_libdir/valgrind/64bit-core.xml
-%_libdir/valgrind/64bit-linux.xml
-%_libdir/valgrind/64bit-sse.xml
-%_libdir/valgrind/32bit-core-valgrind-s*.xml
-%_libdir/valgrind/32bit-linux-valgrind-s*.xml
-%_libdir/valgrind/32bit-sse-valgrind-s*.xml
-%_libdir/valgrind/64bit-core-valgrind-s*.xml
-%_libdir/valgrind/64bit-linux-valgrind-s*.xml
-%_libdir/valgrind/64bit-sse-valgrind-s*.xml
-%_libdir/valgrind/amd64-coresse-valgrind.xml
-%_libdir/valgrind/amd64-linux-valgrind.xml
-%_libdir/valgrind/arm-core-valgrind-s*.xml
-%_libdir/valgrind/arm-core.xml
-%_libdir/valgrind/arm-vfpv3-valgrind-s*.xml
-%_libdir/valgrind/arm-vfpv3.xml
-%_libdir/valgrind/arm-with-vfpv3-valgrind.xml
-%_libdir/valgrind/arm-with-vfpv3.xml
-%_libdir/valgrind/i386-coresse-valgrind.xml
-%_libdir/valgrind/i386-linux-valgrind.xml
-%_libdir/valgrind/power-altivec-valgrind-s*.xml
-%_libdir/valgrind/power-altivec.xml
-%_libdir/valgrind/power-core.xml
-%_libdir/valgrind/power-fpu-valgrind-s*.xml
-%_libdir/valgrind/power-fpu.xml
-%_libdir/valgrind/power-linux-valgrind-s*.xml
-%_libdir/valgrind/power-linux.xml
-%_libdir/valgrind/power64-core-valgrind-s*.xml
-%_libdir/valgrind/power64-core.xml
-%_libdir/valgrind/power64-linux-valgrind-s*.xml
-%_libdir/valgrind/power64-linux.xml
-%_libdir/valgrind/powerpc-altivec32l-valgrind.xml
-%_libdir/valgrind/powerpc-altivec32l.xml
-%_libdir/valgrind/powerpc-altivec64l-valgrind.xml
-%_libdir/valgrind/powerpc-altivec64l.xml
-%_libdir/valgrind/64bit-avx-valgrind-s*.xml
-%_libdir/valgrind/64bit-avx.xml
-%_libdir/valgrind/amd64-avx-coresse-valgrind.xml
-%_libdir/valgrind/amd64-avx-coresse.xml
-%_libdir/valgrind/amd64-avx-linux-valgrind.xml
-%_libdir/valgrind/amd64-avx-linux.xml
-%_libdir/valgrind/mips-cp0-valgrind-s*.xml
-%_libdir/valgrind/mips-cp0.xml
-%_libdir/valgrind/mips-cpu-valgrind-s*.xml
-%_libdir/valgrind/mips-cpu.xml
-%_libdir/valgrind/mips-fpu-valgrind-s*.xml
-%_libdir/valgrind/mips-fpu.xml
-%_libdir/valgrind/mips-linux-valgrind.xml
-%_libdir/valgrind/mips-linux.xml
-%_libdir/valgrind/mips64-cp0-valgrind-s*.xml
-%_libdir/valgrind/mips64-cp0.xml
-%_libdir/valgrind/mips64-cpu-valgrind-s*.xml
-%_libdir/valgrind/mips64-cpu.xml
-%_libdir/valgrind/mips64-fpu-valgrind-s*.xml
-%_libdir/valgrind/mips64-fpu.xml
-%_libdir/valgrind/mips64-linux-valgrind.xml
-%_libdir/valgrind/mips64-linux.xml
-%_libdir/valgrind/power-core-valgrind-s*.xml
-%_libdir/valgrind/s390-acr-valgrind-s*.xml
-%_libdir/valgrind/s390-acr.xml
-%_libdir/valgrind/s390-fpr-valgrind-s*.xml
-%_libdir/valgrind/s390-fpr.xml
-%_libdir/valgrind/s390x-core64-valgrind-s*.xml
-%_libdir/valgrind/s390x-core64.xml
-%_libdir/valgrind/s390x-generic-valgrind.xml
-%_libdir/valgrind/s390x-generic.xml
-%_libdir/valgrind/s390x-linux64-valgrind-s*.xml
-%_libdir/valgrind/s390x-linux64.xml
-
-%if %suse_version > 1100
+%{_libdir}/valgrind/*-linux.so
+%{_libdir}/valgrind/*.supp
+%{_libdir}/valgrind/32bit-core.xml
+%{_libdir}/valgrind/32bit-linux.xml
+%{_libdir}/valgrind/32bit-sse.xml
+%{_libdir}/valgrind/64bit-core.xml
+%{_libdir}/valgrind/64bit-linux.xml
+%{_libdir}/valgrind/64bit-sse.xml
+%{_libdir}/valgrind/32bit-core-valgrind-s*.xml
+%{_libdir}/valgrind/32bit-linux-valgrind-s*.xml
+%{_libdir}/valgrind/32bit-sse-valgrind-s*.xml
+%{_libdir}/valgrind/64bit-core-valgrind-s*.xml
+%{_libdir}/valgrind/64bit-linux-valgrind-s*.xml
+%{_libdir}/valgrind/64bit-sse-valgrind-s*.xml
+%{_libdir}/valgrind/amd64-coresse-valgrind.xml
+%{_libdir}/valgrind/amd64-linux-valgrind.xml
+%{_libdir}/valgrind/arm-core-valgrind-s*.xml
+%{_libdir}/valgrind/arm-core.xml
+%{_libdir}/valgrind/arm-vfpv3-valgrind-s*.xml
+%{_libdir}/valgrind/arm-vfpv3.xml
+%{_libdir}/valgrind/arm-with-vfpv3-valgrind.xml
+%{_libdir}/valgrind/arm-with-vfpv3.xml
+%{_libdir}/valgrind/i386-coresse-valgrind.xml
+%{_libdir}/valgrind/i386-linux-valgrind.xml
+%{_libdir}/valgrind/power-altivec-valgrind-s*.xml
+%{_libdir}/valgrind/power-altivec.xml
+%{_libdir}/valgrind/power-core.xml
+%{_libdir}/valgrind/power-fpu-valgrind-s*.xml
+%{_libdir}/valgrind/power-fpu.xml
+%{_libdir}/valgrind/power-linux-valgrind-s*.xml
+%{_libdir}/valgrind/power-linux.xml
+%{_libdir}/valgrind/power64-core-valgrind-s*.xml
+%{_libdir}/valgrind/power64-core.xml
+%{_libdir}/valgrind/power64-linux-valgrind-s*.xml
+%{_libdir}/valgrind/power64-linux.xml
+%{_libdir}/valgrind/powerpc-altivec32l-valgrind.xml
+%{_libdir}/valgrind/powerpc-altivec32l.xml
+%{_libdir}/valgrind/powerpc-altivec64l-valgrind.xml
+%{_libdir}/valgrind/powerpc-altivec64l.xml
+%{_libdir}/valgrind/64bit-avx-valgrind-s*.xml
+%{_libdir}/valgrind/64bit-avx.xml
+%{_libdir}/valgrind/amd64-avx-coresse-valgrind.xml
+%{_libdir}/valgrind/amd64-avx-coresse.xml
+%{_libdir}/valgrind/amd64-avx-linux-valgrind.xml
+%{_libdir}/valgrind/amd64-avx-linux.xml
+%{_libdir}/valgrind/mips-cp0-valgrind-s*.xml
+%{_libdir}/valgrind/mips-cp0.xml
+%{_libdir}/valgrind/mips-cpu-valgrind-s*.xml
+%{_libdir}/valgrind/mips-cpu.xml
+%{_libdir}/valgrind/mips-fpu-valgrind-s*.xml
+%{_libdir}/valgrind/mips-fpu.xml
+%{_libdir}/valgrind/mips-linux-valgrind.xml
+%{_libdir}/valgrind/mips-linux.xml
+%{_libdir}/valgrind/mips64-cp0-valgrind-s*.xml
+%{_libdir}/valgrind/mips64-cp0.xml
+%{_libdir}/valgrind/mips64-cpu-valgrind-s*.xml
+%{_libdir}/valgrind/mips64-cpu.xml
+%{_libdir}/valgrind/mips64-fpu-valgrind-s*.xml
+%{_libdir}/valgrind/mips64-fpu.xml
+%{_libdir}/valgrind/mips64-linux-valgrind.xml
+%{_libdir}/valgrind/mips64-linux.xml
+%{_libdir}/valgrind/power-core-valgrind-s*.xml
+%{_libdir}/valgrind/s390-acr-valgrind-s*.xml
+%{_libdir}/valgrind/s390-acr.xml
+%{_libdir}/valgrind/s390-fpr-valgrind-s*.xml
+%{_libdir}/valgrind/s390-fpr.xml
+%{_libdir}/valgrind/s390x-core64-valgrind-s*.xml
+%{_libdir}/valgrind/s390x-core64.xml
+%{_libdir}/valgrind/s390x-generic-valgrind.xml
+%{_libdir}/valgrind/s390x-generic.xml
+%{_libdir}/valgrind/s390x-linux64-valgrind-s*.xml
+%{_libdir}/valgrind/s390x-linux64.xml

+%if 0%{?suse_version} > 1100
 %files devel
 %defattr(-,root,root)
 %endif
-%_libdir/valgrind/lib*.a
-/usr/include/valgrind
-/usr/%_lib/pkgconfig/valgrind.pc
+%{_libdir}/valgrind/lib*.a
+%{_includedir}/valgrind
+%{_libdir}/pkgconfig/valgrind.pc

 %changelog