Attachment 942552 Details for Bug 1147728 – Use PBR_VERSION instead of patching

[patch] Use PBR_VERSION instead of patching

keystoneclient-ayoung-0009-PBR_VERSION.patch (text/plain), 1.63 KB, created by Adam Young on 2014-09-30 00:50:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Young

Created: 2014-09-30 00:50:15 UTC

Size: 1.63 KB

patch

obsolete

>From 5d5e6d8607cbb4e6380517973a277dd97c478989 Mon Sep 17 00:00:00 2001
>From: Adam Young <ayoung@redhat.com>
>Date: Mon, 29 Sep 2014 17:27:55 -0400
>Subject: [PATCH 09/10]  PBR_VERSION
>
> Use the PBR_VERSION environment variable when building
> so pbr does not attempt git operations.
>---
> python-keystoneclient.spec | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
>index eeaddd7897663cbf6e196e68500afbf17ea2c905..f2e379f6cd1554b2f8d6ea852633c9bbee158431 100644
>--- a/python-keystoneclient.spec
>+++ b/python-keystoneclient.spec
>@@ -10,7 +10,9 @@ License:    ASL 2.0
> URL:        http://pypi.python.org/pypi/%{name}
> Source0:    http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
> 
>-Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
>+#
>+# patches_base=0.9.0
>+#
> 
> BuildArch:  noarch
> 
>@@ -55,7 +57,6 @@ Identity API.
> %prep
> %setup -q
> 
>-%patch0001 -p1
> 
> # We provide version like this in order to remove runtime dep on pbr.
> sed -i s/REDHATKEYSTONECLIENTVERSION/%{version}/ keystoneclient/__init__.py
>@@ -70,10 +71,10 @@ rm -rf python_keystoneclient.egg-info
> sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
> 
> %build
>-%{__python} setup.py build
>+PBR_VERSION=%{version}.%{milestone} %{__python} setup.py build
> 
> %install
>-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
>+PBR_VERSION=%{version}.%{milestone} %{__python} setup.py install -O1 --skip-build --root %{buildroot}
> install -p -D -m 644 tools/keystone.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/keystone.bash_completion
> 
> # Delete tests
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1147728: 942552 | 942553