- update to SVN snap 11368.

Changed files:
    valgrind-glibc211.patch -> 1.2
    valgrind.spec -> 1.75

diff --git a/valgrind-glibc211.patch b/valgrind-glibc211.patch
deleted file mode 100644 (file)
index dba8e9b..0000000
--- a/valgrind-glibc211.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Submitted By: Agathoklis Hatzimanikas <ag at linuxfromscratch dot org>
-Date: 2010-01-06
-Initial Package Version: 3.5.0
-Upstream Status: Uknown
-Origin: Gentoo
-Description: Allows Valgring to build with glibc-2.11
-
-diff -ruN valgrind-3.5.0/configure.in valgrind-3.5.0-fixed/configure.in
---- valgrind-3.5.0/configure.in        2009-11-07 23:34:37.000000000 +0100
-+++ valgrind-3.5.0-fixed/configure.in  2009-11-07 23:38:14.000000000 +0100
-@@ -656,6 +656,16 @@
- ],
- GLIBC_VERSION="2.10")
- 
-+AC_EGREP_CPP([GLIBC_211], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+  GLIBC_211
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.11")
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include <standards.h>
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
-@@ -742,6 +752,13 @@
-       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-       ;;
-+     2.11)
-+      AC_MSG_RESULT(2.11 family)
-+      AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x])
-+      DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+      DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+      DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+      ;;
-      aix5)
-       AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
-       AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
-@@ -755,7 +772,7 @@
- 
-      *)
-       AC_MSG_RESULT(unsupported version)
--      AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
-+      AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11])
-       AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
-       AC_MSG_ERROR([or Darwin libc])
-       ;;

diff --git a/valgrind.spec b/valgrind.spec
index 230c829e7dbb8537455d79f93df25e4d022fd49d..fb90c9c9bc46c27c9a33ec65fd83fd94c4265e57 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,14 +1,17 @@
+#
+%define                _snap   11368
+#
 Summary:       An open-source memory debugger
 Summary(pl.UTF-8):     Otwarty odpluskwiacz pamięci
 Name:          valgrind
-Version:       3.5.0
-Release:       2
+Version:       3.5.0.%{_snap}
+Release:       1
 License:       GPL
 Group:         Development/Tools
-Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: f03522a4687cf76c676c9494fcc0a517
+#Source0:      http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
+Source0:       %{name}-%{_snap}.tar.xz
+# Source0-md5: 3911019ad90a13c914f77148a7fef95d
 Patch0:                %{name}-debuginfo.patch
-Patch1:                %{name}-glibc211.patch
 URL:           http://valgrind.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -40,9 +43,8 @@ także czyni się programy bardziej stabilnymi. Możliwe jest również
 dokładne profilowanie, dzięki któremu programy zaczną szybciej pracować.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
 %patch0 -p1
-%patch1 -p1
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
@@ -65,17 +67,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf _docs
-mv $RPM_BUILD_ROOT%{_docdir}/valgrind _docs
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS FAQ.txt NEWS README README_MISSING_SYSCALL_OR_IOCTL
-%doc _docs/html
-%doc _docs/valgrind_manual.pdf
+%doc AUTHORS NEWS README README_MISSING_SYSCALL_OR_IOCTL
+#%doc _docs/html
+#%doc _docs/valgrind_manual.pdf
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*-linux
@@ -84,4 +83,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.a
 %{_includedir}/*
 %{_pkgconfigdir}/*.pc
-%{_mandir}/man1/*.1*