- up to 3.5.0; enable tls

[packages/valgrind.git] / valgrind.spec

diff --git a/valgrind.spec b/valgrind.spec
index a394279beed3c9f9cc3a2f729e69326682a3ad79..1f485abbc4720aad8bb0b6040e125c576ee6f200 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,22 +1,19 @@
-# Conditional build:
-%bcond_with    multilib        # enable multilib on amd64
-#
 Summary:       An open-source memory debugger
 Summary(pl.UTF-8):     Otwarty odpluskwiacz pamięci
 Name:          valgrind
-Version:       3.2.3
+Version:       3.5.0
 Release:       1
 License:       GPL
 Group:         Development/Tools
 Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 978847992b136c8d8cb5c6559a91df1c
-Patch0:                %{name}-amd64.patch
-Patch1:                %{name}-nop.patch
+# Source0-md5: f03522a4687cf76c676c9494fcc0a517
+Patch0:                %{name}-debuginfo.patch
 URL:           http://valgrind.org/
 BuildRequires: autoconf
 BuildRequires: automake
 # Needs libc.a
 BuildRequires: glibc-static
+BuildRequires: libgomp-devel
 Obsoletes:     valgrind-callgrind
 Obsoletes:     valgrind-calltree
 ExclusiveArch: %{ix86} %{x8664} ppc ppc64
@@ -43,8 +40,9 @@ dokładne profilowanie, dzięki któremu programy zaczną szybciej pracować.
 
 %prep
 %setup -q
-#%{!?with_multilib:%patch0 -p1}
-#%patch1 -p0
+%patch0 -p1
+
+sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
 %build
 %{__aclocal}
@@ -52,6 +50,10 @@ dokładne profilowanie, dzięki któremu programy zaczną szybciej pracować.
 %{__autoconf}
 %{__automake}
 %configure \
+       --enable-tls \
+%if %{_lib} != "lib"
+       --enable-only64bit \
+%endif
        LDFLAGS="" # no strip!
 %{__make}
 
@@ -61,7 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-strip $RPM_BUILD_ROOT%{_libdir}/%{name}/hp2ps
 rm -rf _docs
 mv $RPM_BUILD_ROOT%{_docdir}/valgrind _docs
 
@@ -75,10 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc _docs/valgrind_manual.pdf
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/*-linux
-%attr(755,root,root) %{_libdir}/%{name}/*-linux/*
-%attr(755,root,root) %{_libdir}/%{name}/hp2ps
+%attr(755,root,root) %{_libdir}/%{name}/*-linux
+%attr(755,root,root) %{_libdir}/%{name}/*.so
 %{_libdir}/%{name}/*.supp
+%{_libdir}/%{name}/*.a
 %{_includedir}/*
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man1/*.1*