Don't append .b1 to version

Adding %{release_letter}%{milestone} to full_release confuses
firestack, because it creates upstream tarballs based on only
%{version}.  Consequently %setup fails as it can't cd to the right
directory.
m2crypto patch fix

Bring patch up-to-date with latest requirements.txt
Remove bug1186389 patch

Merged upstream

Conflicts:
	openstack-heat.spec
heat-cfn, heat-boto, heat-watch removed

The above tools were removed in upstream
34e47b64d926c055d9895c5b3f27949eaca68999 into a separate
developer-only repo.
Disable doc building

Building docs involves importing 'heat.doc.resources' (from
doc/source/conf.py) which leads to the following:

>>> __import__('heat.doc.resources', None, None, ['setup'])
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "heat/doc/resources.py", line 17, in <module>
    from heat.engine import resources
  File "heat/engine/resources/__init__.py", line 15, in <module>
    from heat.openstack.common import log as logging
  File "heat/openstack/common/log.py", line 41, in <module>
    from oslo.config import cfg
ImportError: No module named config

This starts to explode the build-requires; at least
 - python-oslo-config
 - python-netaddr
 - python-paste
 - python-paste-deploy
 - python-iso8601
 - python-lxml
 - python-webob
 - keystoneclient.contrib.ec2

are required (I stopped adding things there)

Take the easy route, and skip doc generation

Conflicts:
	openstack-heat.spec
Merge pull request #2 from ianw/el6

Support for building in firestack/centos