Attachment 941719 Details for Bug 1147084 – Use PBR_VERSION instead of patching

[patch] Use PBR_VERSION instead of patching

0001-PBR_VERSION-instead-of-patching.patch (text/plain), 3.52 KB, created by Adam Young on 2014-09-26 20:59:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Young

Created: 2014-09-26 20:59:40 UTC

Size: 3.52 KB

patch

obsolete

>From d83aa4c93c914acafe3ca4a755a81e5c15f2d058 Mon Sep 17 00:00:00 2001
>From: Adam Young <ayoung@redhat.com>
>Date: Fri, 26 Sep 2014 16:32:51 -0400
>Subject: [PATCH] PBR_VERSION instead of patching
>
>---
> openstack-keystone.spec | 26 ++++++++++----------------
> 1 file changed, 10 insertions(+), 16 deletions(-)
>
>diff --git a/openstack-keystone.spec b/openstack-keystone.spec
>index 8ba5a13..e119c16 100644
>--- a/openstack-keystone.spec
>+++ b/openstack-keystone.spec
>@@ -2,19 +2,19 @@
> # This is 2014.2 Juno-3 milestone
> #
> %global release_name juno
>-%global milestone 3
>+%global milestone 3b
> 
> %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
> 
> Name:           openstack-keystone
> Version:        2014.2
>-Release:        0.4.b%{milestone}%{?dist}
>+Release:        0.4.%{milestone}%{?dist}
> Summary:        OpenStack Identity Service
> 
> License:        ASL 2.0
> URL:            http://keystone.openstack.org/
> #Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
>-Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
>+Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.%{milestone}.tar.gz
> Source1:        openstack-keystone.logrotate
> Source2:        openstack-keystone.service
> Source3:        openstack-keystone.sysctl
>@@ -28,8 +28,6 @@ Source23:       openstack-keystone.upstart
> #
> # patches_base=2014.2.b3
> #
>-Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
>-Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
> 
> BuildArch:      noarch
> BuildRequires:  python2-devel
>@@ -115,10 +113,7 @@ This package contains documentation for Keystone.
> %endif
> 
> %prep
>-%setup -q -n keystone-%{version}.b%{milestone}
>-
>-%patch0001 -p1
>-%patch0002 -p1
>+%setup -q -n keystone-%{version}.%{milestone}
> 
> find . \( -name .gitignore -o -name .placeholder \) -delete
> find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
>@@ -126,10 +121,6 @@ find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
> rm -rf keystone.egg-info
> # Let RPM handle the dependencies
> rm -f test-requirements.txt requirements.txt
>-# Remove dependency on pbr and set version as per rpm
>-sed -i s/REDHATKEYSTONEVERSION/%{version}/ bin/keystone-all keystone/cli.py
>-
>-sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
> 
> # make doc build compatible with python-oslo-sphinx RPM
> sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
>@@ -138,10 +129,10 @@ sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
> cp etc/keystone.conf.sample etc/keystone.conf
> # distribution defaults are located in keystone-dist.conf
> 
>-%{__python} setup.py build
>+PBR_VERSION=%{version}.%{milestone}  %{__python} setup.py build
> 
> %install
>-%{__python} setup.py install --skip-build --root %{buildroot}
>+PBR_VERSION=%{version}.%{milestone} %{__python} setup.py install --skip-build --root %{buildroot}
> 
> # Delete tests
> rm -fr %{buildroot}%{python_sitelib}/keystone/tests
>@@ -265,7 +256,7 @@ fi
> %defattr(-,root,root,-)
> %doc LICENSE
> %{python_sitelib}/keystone
>-%{python_sitelib}/keystone-%{version}-*.egg-info
>+%{python_sitelib}/keystone-%{version}*.egg-info
> 
> %if 0%{?with_doc}
> %files doc
>@@ -273,6 +264,9 @@ fi
> %endif
> 
> %changelog
>+* Fri Sep 26 2014 Adam Young <ayoung@redhat.com> 2014.2-0.4.b3
>+- Removed pbr patches in favor of PBR_VERSION environment variable.
>+
> * Thu Sep 11 2014 Alan Pevec <apevec@redhat.com> 2014.2-0.4.b3
> - update dependencies
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1147084: 941719 | 941760 | 942551