[gdal] Ignore for the moment the test for armadillo

jamatos jamatos at fedoraproject.org
Sun Jul 29 19:28:44 UTC 2012


commit b0e11d42c1635808c205cc9337b24acf52a09d58
Author: José Matos <jamatos at fedoraproject.org>
Date:   Sun Jul 29 20:28:36 2012 +0100

    Ignore for the moment the test for armadillo

 gdal.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/gdal.spec b/gdal.spec
index 11d9197..7c0289c 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -30,7 +30,7 @@
 
 Name:      gdal
 Version:   1.9.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -313,6 +313,13 @@ pushd $f
 popd
 done
 
+# Workaround about wrong result in configure
+# armadillo returns a warning about gcc versions 4.7.0 or 4.7.1
+# due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53549
+# configure interprets the result as an error so ignore it
+# this patch can/should be removed after gcc 4.7.2 is released
+sed -i 's|HAVE_ARMADILLO=$HAVE_ARMADILLO|HAVE_ARMADILLO=yes|' configure
+
 # Build with fPIC to allow Ruby bindings
 # Xcompiler should normally achieve that -- http://trac.osgeo.org/gdal/ticket/3978
 # http://trac.osgeo.org/gdal/ticket/1994
@@ -788,6 +795,9 @@ rm -rf %{buildroot}
 #Or as before, using ldconfig
 
 %changelog
+* Sun Jul 29 2012 José Matos <jamatos at fedoraproject.org> - 1.9.1-9
+- Ignore for the moment the test for armadillo
+
 * Fri Jul 27 2012 José Matos <jamatos at fedoraproject.org> - 1.9.1-8
 - Rebuild for new armadillo
 


More information about the scm-commits mailing list