packages: valgrind/valgrind.spec, valgrind/valgrind-automake-1.11.2.patch (...

[jajcus]

Author: jajcus                       Date: Mon Jan 23 11:07:14 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- automake 1.11.2 compatibility patch
- more specific glibc dependency
- Release: 2

---- Files affected:
packages/valgrind:
   valgrind.spec (1.84 -> 1.85) , valgrind-automake-1.11.2.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/valgrind/valgrind.spec
diff -u packages/valgrind/valgrind.spec:1.84 packages/valgrind/valgrind.spec:1.85
--- packages/valgrind/valgrind.spec:1.84	Sun Dec 11 10:02:13 2011
+++ packages/valgrind/valgrind.spec	Mon Jan 23 12:07:09 2012
@@ -5,18 +5,21 @@
 Summary(pl.UTF-8):	Otwarty odpluskwiacz pamięci
 Name:		valgrind
 Version:	3.7.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Tools
 Source0:	http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	a855fda56edf05614f099dca316d1775
 Patch0:		%{name}-debuginfo.patch
 Patch1:		%{name}-native-cpuid.patch
+Patch2:		%{name}-automake-1.11.2.patch
 URL:		http://valgrind.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gcc >= 5:3.0
 # Needs libc.a
+BuildRequires:	glibc-devel >= 6:2.2
+BuildRequires:	glibc-devel < 6:2.15
 BuildRequires:	glibc-static
 BuildRequires:	libgomp-devel
 BuildRequires:	libstdc++-devel
@@ -49,6 +52,7 @@
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p0
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
@@ -115,6 +119,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2012/01/23 11:07:09  jajcus
+- automake 1.11.2 compatibility patch
+- more specific glibc dependency
+- Release: 2
+
 Revision 1.84  2011/12/11 09:02:13  qboosh
 - more verbose files
 - requires gcc 3.0+ and C++ compiler

================================================================
Index: packages/valgrind/valgrind-automake-1.11.2.patch
diff -u /dev/null packages/valgrind/valgrind-automake-1.11.2.patch:1.1
--- /dev/null	Mon Jan 23 12:07:14 2012
+++ packages/valgrind/valgrind-automake-1.11.2.patch	Mon Jan 23 12:07:09 2012
@@ -0,0 +1,25 @@
+https://bugs.kde.org/show_bug.cgi?id=290719
+--- coregrind/Makefile.am	2011-10-27 12:55:06.000000000 +0200
++++ 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)
+--- Makefile.am	2011-10-26 23:24:45.000000000 +0200
++++ 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/valgrind/valgrind.spec?r1=1.84&r2=1.85&f=u