diff --git a/0001-Remove-runtime-dependency-on-PBR.patch b/0001-Remove-runtime-dependency-on-PBR.patch new file mode 100644 index 0000000..0d6b054 --- /dev/null +++ b/0001-Remove-runtime-dependency-on-PBR.patch @@ -0,0 +1,52 @@ +From 92d70932aab250d5b7fd264b690a79b2f5a655ac Mon Sep 17 00:00:00 2001 +From: Jon Bernard +Date: Tue, 22 Apr 2014 13:16:29 -0400 +Subject: [PATCH] Remove runtime dependency on PBR + +--- + marconi/version.py | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/marconi/version.py b/marconi/version.py +index a3acf95..ebc4d9e 100644 +--- a/marconi/version.py ++++ b/marconi/version.py +@@ -13,11 +13,32 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-import pbr.packaging +-import pbr.version ++MARCONI_VENDOR = "OpenStack Foundation" ++MARCONI_PRODUCT = "OpenStack Marconi" ++MARCONI_PACKAGE = None # OS distro package version suffix + + +-version_info = pbr.version.VersionInfo('marconi') ++class VersionInfo(object): ++ release = "REDHATMARCONIRELEASE" ++ version = "REDHATMARCONIVERSION" ++ ++ def version_string(self): ++ return self.version ++ ++ def cached_version_string(self): ++ return self.version ++ ++ def release_string(self): ++ return self.release ++ ++ def canonical_version_string(self): ++ return self.version ++ ++ def version_string_with_vcs(self): ++ return self.release ++ ++ ++version_info = VersionInfo() + + + def verify_sha(expected): +-- +1.9.1 + diff --git a/openstack-marconi.spec b/openstack-marconi.spec index e485355..967efe2 100644 --- a/openstack-marconi.spec +++ b/openstack-marconi.spec @@ -10,6 +10,11 @@ Source0: https://launchpad.net/marconi/icehouse/%{version}/+download/ma Source1: openstack-marconi.service Source2: openstack-marconi.logrotate +# +# patches_base=2014.1 +# +Patch0001: 0001-Remove-runtime-dependency-on-PBR.patch + BuildArch: noarch BuildRequires: python2-devel @@ -49,6 +54,11 @@ models. Marconi is designed to perform and scale in a multi-tenant environment. %prep %setup -q -n marconi-%{version} +%patch0001 -p1 + +sed -i s/REDHATMARCONIVERSION/%{version}/ marconi/version.py +sed -i s/REDHATMARCONIRELEASE/%{release}/ marconi/version.py + rm -rf {test-,}requirements.txt %build