Accepting request 120599 from home:vuntz:branches:devel:tools

Fix build loop

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

valgrind.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 10 11:26:37 UTC 2012 - vuntz@opensuse.org
+
+- Remove xorg-x11-devel BuildRequires: I can only guess it was
+  there to make sure the xfree supp files are used, but they are
+  used anyway by default. This helps resolve a build loop between
+  libdrm and valgrind.
+
 -------------------------------------------------------------------
 Thu Apr 26 17:41:44 UTC 2012 - joop.boonen@opensuse.org
 

valgrind.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package valgrind
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,6 @@ BuildRequires:  docbook_4
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel-32bit
 BuildRequires:  libxslt
-BuildRequires:  xorg-x11-devel
 %ifarch x86_64 ppc64
 BuildRequires:  gcc-32bit
 BuildRequires:  glibc-devel-32bit
@@ -46,7 +45,7 @@ Patch3:         valgrind-3.7.0-automake-1.11.2.patch
 %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)
 Requires:       glibc >= %glibc_main_version.%glibc_major_version
-Requires:       glibc < %glibc_main_version.%{lua: print(rpm.expand("%glibc_major_version")+1)}
+Requires:       glibc < %glibc_main_version.%{lua:print(rpm.expand("%glibc_major_version")+1)}
 %if %suse_version <= 1100
 Provides:       valgrind-devel = %version
 %endif