diff --git a/.gitignore b/.gitignore index d80cc83..13ad564 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /lorax-24.7.tar.gz /lorax-24.8.tar.gz /lorax-24.9.tar.gz +/lorax-24.10.tar.gz diff --git a/lorax.spec b/lorax.spec index d05ea91..ae202f7 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 24.9 -Release: 2%{?dist} +Version: 24.10 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -18,6 +18,8 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: python3-devel +Requires: lorax-templates + Requires: GConf2 Requires: cpio Requires: device-mapper @@ -102,6 +104,14 @@ Requires: anaconda-tui Additional dependencies required by livemedia-creator when using it with --no-virt to run Anaconda. +%package templates-generic +Summary: Generic build templates for lorax and livemedia-creator +Requires: lorax = %{version}-%{release} +Provides: lorax-templates + +%description templates-generic +Lorax templates for creating the boot.iso and live isos are placed in +/usr/share/lorax/templates.d/99-generic %prep %setup -q -n %{name}-%{version} @@ -126,16 +136,27 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %dir %{_sysconfdir}/lorax %config(noreplace) %{_sysconfdir}/lorax/lorax.conf %dir %{_datadir}/lorax -%{_datadir}/lorax/* %{_mandir}/man1/*.1* %files lmc-virt %files lmc-novirt +%files templates-generic +%{_datadir}/lorax/templates.d/* + + %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 24.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Fri Feb 12 2016 Brian C. Lane 24.10-1 +- Add rng-tools and start rngd.service by default (#1258516) (bcl@redhat.com) +- livemedia-creator: Stop passing --repo to anaconda (#1304802) + (bcl@redhat.com) +- livemedia-creator: Add /usr/share/lorax/templates.d/ support (bcl@redhat.com) +- Move templates to /usr/share/lorax/templates.d/99-generic (bcl@redhat.com) +- Add check for templates.d in the sharedir (bcl@redhat.com) +- Add documentation for the lorax command and templates (bcl@redhat.com) +- Remove the removal of the eintr checker, which has been removed + (dshea@redhat.com) * Wed Jan 13 2016 Brian C. Lane 24.9-1 - livemedia-creator: Add kernel-modules and kernel-modules-extra to examples diff --git a/sources b/sources index d8fd2fd..4b3627e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d07db65b9b26e2e6cbbab090c2095727 lorax-24.9.tar.gz +9f249058763554dc9a4b518724c9da9a lorax-24.10.tar.gz