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

This commit is contained in:
José Matos 2012-07-29 23:01:02 +01:00
parent 9bff36d0eb
commit 50064c4f5c
1 changed files with 5 additions and 2 deletions

View File

@ -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@fedoraproject.org> - 1.9.1-10
- Use the correct shell idiom "if true" instead of "if 1"
* Sun Jul 29 2012 José Matos <jamatos@fedoraproject.org> - 1.9.1-9
- Ignore for the moment the test for armadillo (to be removed after gcc 4.7.2 release)