Set SRS GEOGCS in all cases (reverts r25801 and closes #4160)

git-svn-id: https://svn.osgeo.org/gdal/trunk@25997 f0d54148-0727-0410-94bb-9a71ac55c965