[gdal] Use the correct shell idiom "if true" instead of "if 1"

jamatos jamatos at fedoraproject.org
Sun Jul 29 22:01:23 UTC 2012


commit 50064c4f5c5ddced2832e8f5cde96f8b42944464
Author: José Matos <jamatos at fedoraproject.org>
Date:   Sun Jul 29 23:01:02 2012 +0100

    Use the correct shell idiom "if true" instead of "if 1"

 gdal.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gdal.spec b/gdal.spec
index 3f5e468..7fe6b01 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -30,7 +30,7 @@
 
 Name:      gdal
 Version:   1.9.1
-Release:   9%{?dist}
+Release:   10%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -318,7 +318,7 @@ done
 # 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|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if 1|' configure
+sed -i 's|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if true|' configure
 
 # Build with fPIC to allow Ruby bindings
 # Xcompiler should normally achieve that -- http://trac.osgeo.org/gdal/ticket/3978
@@ -795,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-10
+- Use the correct shell idiom "if true" instead of "if 1"
+
 * Sun Jul 29 2012 José Matos <jamatos at fedoraproject.org> - 1.9.1-9
 - Ignore for the moment the test for armadillo (to be removed after gcc 4.7.2 release)
 


More information about the scm-commits mailing list