Repository: spack/spack

Issue:
intel@18.0.4 installs binaries that report 18.0.5
The intel package @18.0.4 installs binaries that report version 18.0.5. I noticed this when `spack compiler find` pulled them in as 18.0.5.

### Spack version
<!-- Add the output to the command below -->
```console
$ spack --version
0.14.1-454-146bc60
```

### Steps to reproduce the issue

```console
$ spack install intel@18.0.4
$ $(spack location -i intel@18.0.4)/bin/icc --version
icc (ICC) 18.0.5 20180823
Copyright (C) 1985-2018 Intel Corporation.  All rights reserved.
```

### Information on your system

RHEL7.6

### General information

- [X] I have run `spack --version` and reported the version of Spack
- [X] I have searched the issues of this repo and believe this is not a duplicate


Discussion:
@anderbubble The `url` for the `intel@18.0.4` package seems to point to a tarball that contains "update4" in the name. Can you check if this is the case? I'm wondering if the issue is with upstream rather than Spack. 
@alalazo are you just asking me to confirm for sure that the tar that says "update4" really does contain a binary that reports version 18.0.5? 
@anderbubble Sorry, for not being clear. I already checked that, what I'm not sure about is if it is a typo in our package or Intel's fault for having bumped patch version wrongly. Do you have any idea if "parallel_studio_xe_2018_update4" maps to 18.0.4 or if it's some weird numbering scheme that Intel adopts and the compiler version of `"2018_update4" is thus unrelated?

@anderbubble Nevermind, I found [this](https://software.intel.com/en-us/articles/intel-compiler-and-composer-update-version-numbers-to-compiler-version-number-mapping) (thanks @rmsds ) which sounds weird but somehow doesn't surprise me :sweat: It seems Intel passed from `18.0.3` in update 3 to `18.0.5` in update 4. I'll be submitting a PR soon.

Resolving patch:
diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py
--- a/var/spack/repos/builtin/packages/intel/package.py
+++ b/var/spack/repos/builtin/packages/intel/package.py
@@ -20,8 +20,10 @@ class Intel(IntelPackage):
     version('19.0.3',              sha256='15373ac6df2a84e6dd9fa0eac8b5f07ab00cdbb67f494161fd0d4df7a71aff8e', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15272/parallel_studio_xe_2019_update3_composer_edition.tgz')
     version('19.0.1',              sha256='db000cb2ebf411f6e91719db68a0c68b8d3f7d38ad7f2049ea5b2f1b5f006c25', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14832/parallel_studio_xe_2019_update1_composer_edition.tgz')
     version('19.0.0',              sha256='e1a29463038b063e01f694e2817c0fcf1a8e824e24f15a26ce85f20afa3f963a', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13581/parallel_studio_xe_2019_composer_edition.tgz')
-    #
-    version('18.0.4',              sha256='94aca8f091dff9535b02f022a37aef150b36925c8ef069335621496f8e4db267', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13722/parallel_studio_xe_2018_update4_composer_edition.tgz')
+
+    # Version 18.0.5 comes with parallel studio 2018 update 4. See:
+    # https://software.intel.com/en-us/articles/intel-compiler-and-composer-update-version-numbers-to-compiler-version-number-mapping
+    version('18.0.5',              sha256='94aca8f091dff9535b02f022a37aef150b36925c8ef069335621496f8e4db267', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13722/parallel_studio_xe_2018_update4_composer_edition.tgz')
     version('18.0.3',              sha256='f21f7759709a3d3e3390a8325fa89ac79b1fce8890c292e73b2ba3ec576ebd2b', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz')
     version('18.0.2',              sha256='02d2a9fb10d9810f85dd77700215c4348d2e4475e814e4f086eb1442462667ff', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12722/parallel_studio_xe_2018_update2_composer_edition.tgz')
     version('18.0.1',              sha256='db9aa417da185a03a63330c9d76ee8e88496ae6b771584d19003a29eedc7cab5', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz')


Test patch: