openstack
/
fuel-octane
Code Issues Proposed changes

Include patches recursively in RPM package 

Parametrize the RPM spec with python2 macros and add
patches to  the build directory recursively  to make
sure that all of them are included.

Change-Id: I49488776047b32b0a939bbbe435c0c286eabedee
Closes-bug: 1585528
This commit is contained in:
Oleg Gelbukh 2016-05-25 10:03:24 +00:00
parent 89264f2320
commit 597c8c617b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
specs/octane.spec
View File

@ -34,13 +34,14 @@ installations to version 9.0.
%setup -cq -n %{name}-%{version}
%build
cd %{_builddir}/%{name}-%{version} && OSLO_PACKAGE_VERSION=%{version} python setup.py egg_info && cp octane.egg-info/PKG-INFO . && python setup.py build
cd %{_builddir}/%{name}-%{version} && OSLO_PACKAGE_VERSION=%{version} %{__python2} setup.py egg_info && cp octane.egg-info/PKG-INFO . && %{__python2} setup.py build
%install
cd %{_builddir}/%{name}-%{version} && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/INSTALLED_FILES
cd %{_builddir}/%{name}-%{version} && %{__python} setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/INSTALLED_FILES
cp -vr %{_builddir}/%{name}-%{version}/octane/patches ${RPM_BUILD_ROOT}/%{python2_sitelib}/octane/
%files -f %{_builddir}/%{name}-%{version}/INSTALLED_FILES
%{python2_sitelib}/octane/patches/*
%defattr(-,root,root)