our builders unable to resolve file build conflict, so force package conflict

[packages/crossnacl-gcc.git] / crossnacl-gcc.spec

diff --git a/crossnacl-gcc.spec b/crossnacl-gcc.spec
index 93436dbc996c00b02de072903186a994a0f6950d..e69fca0f4bdfbf05830108fa72175b2e21b3a680 100644 (file)
--- a/crossnacl-gcc.spec
+++ b/crossnacl-gcc.spec
@@ -2,15 +2,15 @@
 # Conditional build:
 %bcond_with    bootstrap               # build without NaCL newlib package dependency (without c++ package)
 
-%define                gitver  3937565
+%define                gitver  455063d
 Summary:       Various compilers (C, C++) for NaCl
 Name:          crossnacl-gcc
 Version:       4.4.3
 Release:       6.git%{gitver}
 License:       GPL v3+ and GPL v3+ with exceptions and GPL v2+ with exceptions
 Group:         Development/Languages
-Source0:       nacl-gcc-%{version}-git%{gitver}.tar.bz2
-# Source0-md5: fcdfdd30b82d8ad8fa6e39e7e32cee64
+Source0:       nacl-gcc-%{version}-git%{gitver}.tar.xz
+# Source0-md5: dd49a8726695a06c7fe9fc531dc6c637
 Source1:       get-source.sh
 URL:           http://sourceware.org/gcc/
 BuildRequires: cloog-ppl-devel
@@ -20,6 +20,9 @@ BuildRequires:        gmp-c++-devel
 BuildRequires: gmp-devel
 BuildRequires: mpfr-devel
 BuildRequires: ppl-pwl-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+BuildConflicts:        cloog-isl-devel
 %if %{without bootstrap}
 BuildRequires: crossnacl-newlib
 %endif
@@ -33,6 +36,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                gccnlib         %{_prefix}/lib/gcc/%{target}/%{gcc_ver}
 
 %define                filterout_cpp   -D_FORTIFY_SOURCE=[0-9]+
+%define                filterout_c             -Werror=format-security
 
 %description
 The gcc package contains the GNU Compiler Collection version 4.4.3.