- composer: Fix open file warnings (bcl@redhat.com)
- ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) - tests: Fix open file warning in test_execWithRedirect (bcl@redhat.com) - Cleanup imgutil open files and processes (bcl@redhat.com) - tests: Remove test_del_execReadlines (bcl@redhat.com) - Fix unclosed files (bcl@redhat.com) - test: Use Python dev mode during testing (bcl@redhat.com) - tests: Update composer-cli blueprint server tests (bcl@redhat.com) - runtime-cleanup: Delete .pyc files (bcl@redhat.com) - New lorax documentation - 34.3 (bcl@redhat.com) - doc: Add Blueprint documentation and example to composer-cli.rst (bcl@redhat.com) - docs: Update docs for lorax-composer removal (bcl@redhat.com) - tests: Remove unused lorax-composer tests (bcl@redhat.com) - Remove lorax-composer, it has been replaced by osbuild-composer (bcl@redhat.com)
This commit is contained in:
parent
9b33f62604
commit
195074814e
1
.gitignore
vendored
1
.gitignore
vendored
@ -188,3 +188,4 @@
|
||||
/lorax-34.0.tar.gz
|
||||
/lorax-34.1.tar.gz
|
||||
/lorax-34.2.tar.gz
|
||||
/lorax-34.3.tar.gz
|
||||
|
97
lorax.spec
97
lorax.spec
@ -3,7 +3,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: lorax
|
||||
Version: 34.2
|
||||
Version: 34.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Tool for creating the anaconda install images
|
||||
|
||||
@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Requires: lorax-templates
|
||||
|
||||
@ -94,8 +95,7 @@ Summary: Lorax html documentation
|
||||
Requires: lorax = %{version}-%{release}
|
||||
|
||||
%description docs
|
||||
Includes the full html documentation for lorax, livemedia-creator, lorax-composer and the
|
||||
pylorax library.
|
||||
Includes the full html documentation for lorax, livemedia-creator, and the pylorax library.
|
||||
|
||||
%package lmc-virt
|
||||
Summary: livemedia-creator libvirt dependencies
|
||||
@ -132,42 +132,6 @@ Provides: lorax-templates = %{version}-%{release}
|
||||
Lorax templates for creating the boot.iso and live isos are placed in
|
||||
/usr/share/lorax/templates.d/99-generic
|
||||
|
||||
%package composer
|
||||
Summary: Lorax Image Composer API Server
|
||||
# For Sphinx documentation build
|
||||
BuildRequires: python3-flask python3-gobject libgit2-glib python3-toml python3-semantic_version
|
||||
|
||||
Requires: lorax = %{version}-%{release}
|
||||
Requires(pre): /usr/bin/getent
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
|
||||
Requires: python3-toml
|
||||
Requires: python3-semantic_version
|
||||
Requires: libgit2
|
||||
Requires: libgit2-glib
|
||||
Requires: python3-flask
|
||||
Requires: python3-gevent
|
||||
Requires: anaconda-tui >= 29.19-1
|
||||
Requires: qemu-img
|
||||
Requires: tar
|
||||
Requires: python3-rpmfluff
|
||||
Requires: git
|
||||
Requires: xz
|
||||
Requires: createrepo_c
|
||||
Requires: python3-ansible-runner
|
||||
# For AWS playbook support
|
||||
Requires: python3-boto3
|
||||
|
||||
%{?systemd_requires}
|
||||
BuildRequires: systemd
|
||||
|
||||
# Implements the weldr API
|
||||
Provides: weldr
|
||||
|
||||
%description composer
|
||||
lorax-composer provides a REST API for building images using lorax.
|
||||
|
||||
%package -n composer-cli
|
||||
Summary: A command line tool for use with the lorax-composer API server
|
||||
|
||||
@ -188,29 +152,6 @@ build images, etc. from the command line.
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
|
||||
|
||||
# Install example blueprints from the test suite.
|
||||
# This path MUST match the lorax-composer.service blueprint path.
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/lorax/composer/blueprints/
|
||||
for bp in example-http-server.toml example-development.toml example-atlas.toml; do
|
||||
cp ./tests/pylorax/blueprints/$bp $RPM_BUILD_ROOT/var/lib/lorax/composer/blueprints/
|
||||
done
|
||||
|
||||
%pre composer
|
||||
getent group weldr >/dev/null 2>&1 || groupadd -r weldr >/dev/null 2>&1 || :
|
||||
getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin -c "User for lorax-composer" weldr >/dev/null 2>&1 || :
|
||||
|
||||
%post composer
|
||||
%systemd_post lorax-composer.service
|
||||
%systemd_post lorax-composer.socket
|
||||
|
||||
%preun composer
|
||||
%systemd_preun lorax-composer.service
|
||||
%systemd_preun lorax-composer.socket
|
||||
|
||||
%postun composer
|
||||
%systemd_postun_with_restart lorax-composer.service
|
||||
%systemd_postun_with_restart lorax-composer.socket
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%license COPYING
|
||||
@ -245,22 +186,6 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
%dir %{_datadir}/lorax/templates.d
|
||||
%{_datadir}/lorax/templates.d/*
|
||||
|
||||
%files composer
|
||||
%config(noreplace) %{_sysconfdir}/lorax/composer.conf
|
||||
%{python3_sitelib}/pylorax/api/*
|
||||
%{python3_sitelib}/lifted/*
|
||||
%{_sbindir}/lorax-composer
|
||||
%{_unitdir}/lorax-composer.service
|
||||
%{_unitdir}/lorax-composer.socket
|
||||
%dir %{_datadir}/lorax/composer
|
||||
%{_datadir}/lorax/composer/*
|
||||
%{_datadir}/lorax/lifted/*
|
||||
%{_tmpfilesdir}/lorax-composer.conf
|
||||
%dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/
|
||||
%dir %attr(0771, root, weldr) %{_sharedstatedir}/lorax/composer/blueprints/
|
||||
%attr(0771, weldr, weldr) %{_sharedstatedir}/lorax/composer/blueprints/*
|
||||
%{_mandir}/man1/lorax-composer.1*
|
||||
|
||||
%files -n composer-cli
|
||||
%{_bindir}/composer-cli
|
||||
%{python3_sitelib}/composer/*
|
||||
@ -268,6 +193,22 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
%{_mandir}/man1/composer-cli.1*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 07 2020 Brian C. Lane <bcl@redhat.com> 34.3-1
|
||||
- composer: Fix open file warnings (bcl@redhat.com)
|
||||
- ltmpl: Fix deprecated escape in docstring (bcl@redhat.com)
|
||||
- tests: Fix open file warning in test_execWithRedirect (bcl@redhat.com)
|
||||
- Cleanup imgutil open files and processes (bcl@redhat.com)
|
||||
- tests: Remove test_del_execReadlines (bcl@redhat.com)
|
||||
- Fix unclosed files (bcl@redhat.com)
|
||||
- test: Use Python dev mode during testing (bcl@redhat.com)
|
||||
- tests: Update composer-cli blueprint server tests (bcl@redhat.com)
|
||||
- runtime-cleanup: Delete .pyc files (bcl@redhat.com)
|
||||
- New lorax documentation - 34.3 (bcl@redhat.com)
|
||||
- doc: Add Blueprint documentation and example to composer-cli.rst (bcl@redhat.com)
|
||||
- docs: Update docs for lorax-composer removal (bcl@redhat.com)
|
||||
- tests: Remove unused lorax-composer tests (bcl@redhat.com)
|
||||
- Remove lorax-composer, it has been replaced by osbuild-composer (bcl@redhat.com)
|
||||
|
||||
* Tue Sep 29 2020 Brian C. Lane <bcl@redhat.com> 34.2-1
|
||||
- runtime-cleanup: Remove ncurses package (bcl@redhat.com)
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (lorax-34.2.tar.gz) = df405c59c1a43d452bcd159d3e25c46a14cfcdc8da06ef0004f90f0fbebc0b6d48d87d67c14b02fa7f0d8f736dfd14b441bd63fabda50ea9f90c759d07be7409
|
||||
SHA512 (lorax-34.3.tar.gz) = 7953664ca44c2591b2245ffdd58c004a623135ee540d4835f737f90361cc53ae903ba7f8f5d0ae45f6eff7d64144b3301e6cc16930c68c20d8d6fed91e1e9179
|
||||
|
Loading…
Reference in New Issue
Block a user