From 46d4e25635f54c6818314f6016650ef61a6bda07854e487bfd62c83a3a43e2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 12 Apr 2016 13:19:49 +0000 Subject: [PATCH] Revert last due to build cycle OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=450 --- llvm.changes | 9 --------- llvm.spec | 6 ++---- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/llvm.changes b/llvm.changes index 5af69b1..bbcdc61 100644 --- a/llvm.changes +++ b/llvm.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Mon Apr 11 09:33:46 UTC 2016 - dimstar@opensuse.org - -- Change condition to apply glibc-2.23 patch: - + Base it on the version of glibc: if > 2.22.9999, apply the - patch. - + Add zypper BuildRequires: this is the most reasonable way to - reliably compare rpm version numbers. - ------------------------------------------------------------------- Mon Apr 11 08:45:56 UTC 2016 - idonmez@suse.com diff --git a/llvm.spec b/llvm.spec index bfbbda8..357a425 100644 --- a/llvm.spec +++ b/llvm.spec @@ -86,8 +86,6 @@ BuildRequires: ncurses-devel BuildRequires: ninja BuildRequires: python-base BuildRequires: python-xml -# zypper is only needed to identify if patch10 should be applied -BuildRequires: zypper # llvm does not work on ppc or s390 ExcludeArch: ppc s390 @@ -184,9 +182,9 @@ disassembler. %patch7 %patch8 -p1 %patch9 -if zypper vcmp $(rpm -q --qf "%{version}" glibc) 2.22.9999 | grep "is newer"; then +%if 0%{?suse_version} > 1320 %patch10 -fi +%endif # Move into right place mv cfe-%{version}.src tools/clang