Put upstream_version back in place.

In commit 4f1b1170ae4d927f2eece4e66ada61648ae7d03b we nuked
the {upstream_version} variable to setup -q which is critical
to building the upstream RPMs.