From 7251718484aade049e94b5a0ba59f6d74d0f21be Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Mon, 23 Feb 2015 15:06:32 +0000 Subject: updated to latest pytz now using .tar --- strata/openstack-clients.morph | 4 ++-- strata/openstack-clients/pytz.morph | 4 ++-- strata/openstack-common.morph | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 1b348630..2de645df 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -62,8 +62,8 @@ chunks: - name: pytz morph: strata/openstack-clients/pytz.morph repo: upstream:pytz - ref: 384207f01fd5b8bf1eb20cb64c17679084731944 - unpetrify-ref: baserock/morph + ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 + unpetrify-ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 build-depends: [] - name: babel repo: upstream:babel diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pytz.morph index f5557946..b8f3e7aa 100644 --- a/strata/openstack-clients/pytz.morph +++ b/strata/openstack-clients/pytz.morph @@ -1,6 +1,6 @@ name: pytz kind: chunk build-commands: -- cd src && python setup.py build +- python setup.py build install-commands: -- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" +- python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 494a9cae..d18cb7ea 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -19,12 +19,10 @@ chunks: build-depends: - pycparser - name: pytz -# TODO: Rebase baserock/morph with the latest stable -# tag. morph: strata/openstack-clients/pytz.morph repo: upstream:pytz - ref: 384207f01fd5b8bf1eb20cb64c17679084731944 - unpetrify-ref: baserock/morph + ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 + unpetrify-ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016 build-depends: [] - name: python-requests repo: upstream:python-requests -- cgit v1.2.1