Decouple upstream build from downstream

Currently the upstream build depends on the downstream rpm, which creates a strange dependency relationship as we release a newer upstream version but can't build one until we build and update rpms downstream.

Ideally, we want to bring downstream patches to upstream and make upstream build independent of downstream.