Browse Source

valgrind to 3.6.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2201 ec354946-7b23-47d6-9f5a-488ba84defc7
owa 13 years ago
parent
commit
f9a65ed04f
1 changed files with 22 additions and 32 deletions
  1. 22 32
      v/valgrind/valgrind-vl.spec

+ 22 - 32
v/valgrind/valgrind-vl.spec

@@ -1,15 +1,16 @@
 Summary: Valgrind Memory Debugger
 Summary(ja): Valgrind メモリデバッガ
 Name: valgrind
-Version: 3.5.0
+Version: 3.6.0
 Release: 1%{?_dist_release}
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Tools
 Source: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-#BuildRequires: glibc <= 2.10
-BuildRequires: glibc-devel >= 2.11
+BuildRequires: gcc <= 4.5
+BuildRequires: glibc-devel <= 2.12
+Requires: glibc <= 2.12
 ExclusiveArch: %{ix86} x86_64 ppc
 
 ## from fc12
@@ -54,19 +55,19 @@ or valgrind plugins.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+##%patch4 -p1
+##%patch5 -p1
+##%patch6 -p1
+##%patch7 -p1
+##%patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1 -b .glibc-2.11
+##%patch10 -p1
+##%patch11 -p1
+##%patch12 -p1
+##%patch13 -p1
+##%patch14 -p1
+##%patch15 -p1
+##%patch16 -p1 -b .glibc-2.11
 autoconf
 
 
@@ -78,7 +79,6 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%makeinstall
 
 rm -rf docs.installed
 mkdir docs.installed
@@ -87,33 +87,17 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/* docs.installed/
 # remove unuse files
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 
-%if %{_lib} == lib64
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/
-pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/
-mv *-x86-* $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/
-for i in *-amd64-*; do
-  j=`echo $i | sed 's/-amd64-/-x86-/'`
-  ln -sf ../../lib/%{name}/$j $j
-done
-popd
-%endif
-
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ.txt NEWS README*
 %doc docs.installed/html docs.installed/valgrind_manual.{pdf,ps}
 %{_bindir}/*
-%dir %{_prefix}/lib/%{name}
-%{_prefix}/lib/%{name}/*
-%if %{_lib} == lib64
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
-%endif
 %{_mandir}/man1/*
 
 %files devel
@@ -123,6 +107,12 @@ popd
 
 
 %changelog
+* Thu Nov 11 2010 Shu KONNO <owa@bg.wakwak.com> 3.6.0-1
+- updated valgrind to 3.6.0
+- updated BR: glibc-devel <= 2.12
+- added BR: gcc <= 4.5
+- added RQ: glibc <= 2.12
+
 * Tue Oct 05 2010 Shu KONNO <owa@bg.wakwak.com> 3.5.0-1
 - updated valgrind to 3.5.0
 - added BR: glibc-devel >= 2.11