diff --git a/.gitignore b/.gitignore index 4a8097f..42fde60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lorax-28.14.58.tar.gz +SOURCES/lorax-28.14.62.tar.gz diff --git a/.lorax.metadata b/.lorax.metadata index dea3a17..f3db678 100644 --- a/.lorax.metadata +++ b/.lorax.metadata @@ -1 +1 @@ -7fafc36e1556a2eeb460c6221f66649661dc5298 SOURCES/lorax-28.14.58.tar.gz +272d512714ba2690d9e8935a83b2cadfde8f0243 SOURCES/lorax-28.14.62.tar.gz diff --git a/SPECS/lorax.spec b/SPECS/lorax.spec index 53f6d04..a84bd39 100644 --- a/SPECS/lorax.spec +++ b/SPECS/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 28.14.58 +Version: 28.14.62 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -168,6 +168,9 @@ Summary: A command line tool for use with the lorax-composer API server Requires: python3-urllib3 Requires: python3-pytoml +# composer-cli manpage moved to composer-cli package in 28.14.59 +Conflicts: lorax < 28.14.59 + %description -n composer-cli A command line tool for use with the lorax-composer API server. Examine recipes, build images, etc. from the command line. @@ -216,11 +219,14 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_sbindir}/lorax %{_sbindir}/mkefiboot %{_sbindir}/livemedia-creator +%{_sbindir}/mkksiso %{_bindir}/image-minimizer %dir %{_sysconfdir}/lorax %config(noreplace) %{_sysconfdir}/lorax/lorax.conf %dir %{_datadir}/lorax -%{_mandir}/man1/*.1* +%{_mandir}/man1/lorax.1* +%{_mandir}/man1/livemedia-creator.1* +%{_mandir}/man1/mkksiso.1* %{_tmpfilesdir}/lorax.conf %files docs @@ -246,13 +252,51 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %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/* %{_sysconfdir}/bash_completion.d/composer-cli +%{_mandir}/man1/composer-cli.1* %changelog +* Thu Sep 16 2021 Brian C. Lane 28.14.62-1 +- Increase root partition of rhel-livemedia.ks to 8000MB (bcl) + Resolves: rhbz#2001942 + +* Thu Jul 08 2021 Brian C. Lane - 28.14.61-2 +- Add Conflicts to composer-cli for manpage move + Related: rhbz#1928962 + +* Wed Jul 07 2021 Brian C. Lane 28.14.61-1 +- Increase example kickstart root partitions to at least 4000MB (bcl) + Resolves: rhbz#1973407 + +* Tue Jun 29 2021 Brian C. Lane 28.14.60-1 +- New lorax documentation - 28.14.59 (bcl) + Related: rhbz#1955355 +- docs: Add missing mkksiso.1 manpage (bcl) + Related: rhbz#1955355 +- docs: Fix reference in composer-cli.rst (bcl) + Related: rhbz#1915361 +- Makefile: Use user-mode podman and fix docs-in-docker target (bcl) + Related: rhbz#1955355 + +* Tue Jun 29 2021 Brian C. Lane 28.14.59-1 +- Backport mkksiso to RHEL 8.5.0 (bcl) + Resolves: rhbz#1955355 +- Move manpages into the correct subpackages (bcl) + Resolves: rhbz#1928962 +- composer-cli: Update documentation URLs (bcl) + Resolves: rhbz#1915361 +- Use wildcard for grub2 modules in livemedia.ks example (bcl) + Related: rhbz#1973530 +- runtime-install: Install ipcalc (bcl) + Related: rhbz#1958314 +- test: Add new osbuild-composer expected types (martin) (martin) +- test: Fix URL to bots testmap (martin) (martin) + * Thu Mar 04 2021 Brian C. Lane 28.14.58-1 - composer-cli: Add support for start-ostree --url URL (bcl) Resolves: rhbz#1929381