From 515ec4b65354d69d4263cbb675f6ada703dddd2b Mon Sep 17 00:00:00 2001 From: matt Date: Oct 08 2008 14:53:04 +0000 Subject: Ugh, gcc 4.3.2 now --- diff --git a/DetectGCC431.patch b/DetectGCC431.patch deleted file mode 100644 index 4dda95f..0000000 --- a/DetectGCC431.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac ---- condor-7.0.2.orig/src/configure.ac 2008-06-11 10:04:54.000000000 -0500 -+++ condor-7.0.2/src/configure.ac 2008-06-11 10:04:07.000000000 -0500 -@@ -877,6 +877,12 @@ - CompilerMinor="2" - CompilerPatch="1" - ;; -+ "4.3.1" ) -+ CompilerKind="GCC" -+ CompilerMajor="4" -+ CompilerMinor="3" -+ CompilerPatch="1" -+ ;; - * ) - if test "x$enable_gcc_version_check" = "xyes"; then - AC_MSG_RESULT([ERROR]) diff --git a/DetectGCC432.patch b/DetectGCC432.patch new file mode 100644 index 0000000..a0ff3f4 --- /dev/null +++ b/DetectGCC432.patch @@ -0,0 +1,16 @@ +diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac +--- condor-7.0.2.orig/src/configure.ac 2008-06-11 10:04:54.000000000 -0500 ++++ condor-7.0.2/src/configure.ac 2008-06-11 10:04:07.000000000 -0500 +@@ -877,6 +877,12 @@ + CompilerMinor="2" + CompilerPatch="1" + ;; ++ "4.3.2" ) ++ CompilerKind="GCC" ++ CompilerMajor="4" ++ CompilerMinor="3" ++ CompilerPatch="2" ++ ;; + * ) + if test "x$enable_gcc_version_check" = "xyes"; then + AC_MSG_RESULT([ERROR]) diff --git a/condor.spec b/condor.spec index a2fa512..985ec49 100644 --- a/condor.spec +++ b/condor.spec @@ -22,7 +22,7 @@ Source0: condor-7.0.5-105846-RH.tar.gz Source1: generate-tarball.sh Patch0: condor_config.generic.patch Patch2: GLibCFlag28.patch -Patch3: DetectGCC431.patch +Patch3: DetectGCC432.patch Patch4: autoconf-relax-quoting.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)