Accepting request 632027 from home:StefanBruens:branches:devel:tools

- Filter out -m64 from optflags, breaks build of 32 bit parts
- Cleanup, remove suse_version < 1100 conditionals
- Use %license for COPYING, COPYING.DOCS

OBS-URL: https://build.opensuse.org/request/show/632027
OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=168

valgrind.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 28 19:39:14 UTC 2018 - stefan.bruens@rwth-aachen.de
+
+- Filter out -m64 from optflags, breaks build of 32 bit parts
+- Cleanup, remove suse_version < 1100 conditionals
+- Use %license for COPYING, COPYING.DOCS
+
 -------------------------------------------------------------------
 Mon Aug 27 22:22:17 UTC 2018 - stefan.bruens@rwth-aachen.de
 

valgrind.spec

@@ -19,11 +19,8 @@
 # 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
+
 Name:           valgrind
 Version:        3.13.0
 Release:        0
@@ -58,9 +55,6 @@ ExclusiveArch:  aarch64 %ix86 x86_64 ppc ppc64 ppc64le s390x armv7l armv7hl armv
 BuildRequires:  gcc-32bit
 BuildRequires:  glibc-devel-32bit
 %endif
-%if 0%{?suse_version} <= 1100
-Provides:       valgrind-devel = %{version}
-%endif
 
 %description
 Valgrind checks all memory operations in an application, like read,
@@ -82,7 +76,6 @@ 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.
 
-%if 0%{?suse_version} > 1100
 %package devel
 Summary:        Memory Management Debugger
 Group:          Development/Tools/Debuggers
@@ -108,7 +101,6 @@ 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.
 
-%endif
 
 %prep
 %setup -q
@@ -131,12 +123,13 @@ FLAGS=${FLAGS/-mthumb/-mthumb-interwork -marm}
 FLAGS="${FLAGS/-D_FORTIFY_SOURCE=2/}"
 FLAGS="${FLAGS/-fstack-protector-strong/}"
 FLAGS="${FLAGS/-fstack-protector/}"
+# -m64 / -m32 is set explicitly everywhere, do not override it
+FLAGS="${FLAGS/-m64/}"
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 export FFLAGS="$FLAGS"
-%if 0%{?suse_version} > 1100
 autoreconf -fi
-%endif
+
 export GDB=%{_bindir}/gdb
 %configure \
 %ifarch aarch64
@@ -159,10 +152,10 @@ if test -d %{buildroot}%{_datadir}/doc/valgrind; then
      mv %{buildroot}%{_datadir}/doc/valgrind %{buildroot}/%{_defaultdocdir}
 fi
 mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -a README* NEWS AUTHORS COPYING COPYING.DOCS %{buildroot}/%{_defaultdocdir}/%{name}
+cp -a README* NEWS AUTHORS %{buildroot}/%{_defaultdocdir}/%{name}
 
 %files
-%defattr(-,root,root)
+%license COPYING COPYING.DOCS 
 %{_bindir}/*
 %doc %{_defaultdocdir}/%{name}
 %doc %{_mandir}/*/*
@@ -268,10 +261,7 @@ cp -a README* NEWS AUTHORS COPYING COPYING.DOCS %{buildroot}/%{_defaultdocdir}/%
 %{_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
 %{_includedir}/valgrind
 %{_libdir}/pkgconfig/valgrind.pc