From 2c36b44e084e24e50d617f74bd9d729a47b7df92 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 16 May 2019 10:41:38 -0700 Subject: [PATCH] - Add kernel to ext4-filesystem template (bcl@redhat.com) - Create a lorax-docs package with the html docs (bcl@redhat.com) - Add new documentation branches to index.rst (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 22 ++++++++++++++++++++-- sources | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dec156b..aa24da9 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,4 @@ /lorax-31.3.tar.gz /lorax-31.4.tar.gz /lorax-31.5.tar.gz +/lorax-31.6.tar.gz diff --git a/lorax.spec b/lorax.spec index d82edde..41c9246 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 31.5 +Version: 31.6 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -87,6 +87,14 @@ It also includes livemedia-creator which is used to create bootable livemedia, including live isos and disk images. It can use libvirtd for the install, or Anaconda's image install feature. +%package docs +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. + %package lmc-virt Summary: livemedia-creator libvirt dependencies Requires: lorax = %{version}-%{release} @@ -196,7 +204,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %files %defattr(-,root,root,-) %license COPYING -%doc AUTHORS docs/livemedia-creator.rst docs/product-images.rst +%doc AUTHORS +%doc docs/composer-cli.rst docs/lorax.rst docs/livemedia-creator.rst docs/product-images.rst +%doc docs/lorax-composer.rst %doc docs/*ks %{python3_sitelib}/pylorax %{python3_sitelib}/*.egg-info @@ -212,6 +222,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/livemedia-creator.1* %{_tmpfilesdir}/lorax.conf +%files docs +%doc docs/html/* + %files lmc-virt %files lmc-novirt @@ -241,6 +254,11 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Thu May 16 2019 Brian C. Lane 31.6-1 +- Add kernel to ext4-filesystem template (bcl@redhat.com) +- Create a lorax-docs package with the html docs (bcl@redhat.com) +- Add new documentation branches to index.rst (bcl@redhat.com) + * Tue May 07 2019 Brian C. Lane 31.5-1 - Add python3-pycdlib to Dockerfile.test (bcl@redhat.com) - Replace isoinfo with pycdlib (bcl@redhat.com) diff --git a/sources b/sources index 3a82978..679219a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-31.5.tar.gz) = 9f94b5574d34a004e650b565e1fcefddc588c4501c28a040d9f5f232427634be5b3f7cbe39c923df7c824784485eec602be462f3b9b422e6635f578e018b5ee7 +SHA512 (lorax-31.6.tar.gz) = c9aeabe177a06d6d25ebbde1790ea090b01d33e69625b6b9e23dd746f8a3477538a908509567a6a1629691ef2a40ad0c10eb5ff1407ac2416a4915ee4fed81bc