Add requires on lorax-templates-rhel
Also switch to using the %{buildroot} macro and %autosetup
This commit is contained in:
parent
3f054d6a3a
commit
5b83da690e
13
lorax.spec
13
lorax.spec
@ -19,6 +19,9 @@ Source0: %{name}-%{version}.tar.gz
|
|||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
|
|
||||||
Requires: lorax-templates
|
Requires: lorax-templates
|
||||||
|
%if 0%{?rhel} >= 8
|
||||||
|
Requires: lorax-templates-rhel
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires: GConf2
|
Requires: GConf2
|
||||||
Requires: cpio
|
Requires: cpio
|
||||||
@ -155,18 +158,18 @@ A command line tool for use with the lorax-composer API server. Examine recipes,
|
|||||||
build images, etc. from the command line.
|
build images, etc. from the command line.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%autosetup -p1 -n %{name}-%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf %{buildroot}
|
||||||
make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
|
make DESTDIR=%{buildroot} mandir=%{_mandir} install
|
||||||
|
|
||||||
# Install example blueprints from the test suite.
|
# Install example blueprints from the test suite.
|
||||||
# This path MUST match the lorax-composer.service blueprint path.
|
# This path MUST match the lorax-composer.service blueprint path.
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/lib/lorax/composer/blueprints/
|
mkdir -p %{buildroot}/var/lib/lorax/composer/blueprints/
|
||||||
cp ./tests/pylorax/blueprints/*toml $RPM_BUILD_ROOT/var/lib/lorax/composer/blueprints/
|
cp ./tests/pylorax/blueprints/*toml %{buildroot}/var/lib/lorax/composer/blueprints/
|
||||||
|
|
||||||
%pre composer
|
%pre composer
|
||||||
getent group weldr >/dev/null 2>&1 || groupadd -r weldr >/dev/null 2>&1 || :
|
getent group weldr >/dev/null 2>&1 || groupadd -r weldr >/dev/null 2>&1 || :
|
||||||
|
Loading…
Reference in New Issue
Block a user