From d588db6b94198ad2d9e5413831335464a0d8363c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 15 May 2015 17:14:32 -0700 Subject: [PATCH] - Update execWith* docstrings (bcl@redhat.com) - livemedia-creator: Update example kickstarts (bcl@redhat.com) - Update fedora-livemedia.ks example (bcl@redhat.com) - Include html documentation under docs/html (bcl@redhat.com) - Switch documentation to python3 (bcl@redhat.com) - Create html documentation under docs/html/ (bcl@redhat.com) - livemedia-creator: Catch missing package errors (bcl@redhat.com) - Update spec for python3 and add subpackages for lmc (bcl@redhat.com) - Convert to using pocketlint for pylint rules (bcl@redhat.com) - Convert livemedia-creator to py3 (bcl@redhat.com) - Convert test-parse-template to py3 (bcl@redhat.com) - Update image-minimizer for py3 (bcl@redhat.com) - Change mkefiboot to py3 (bcl@redhat.com) - Additional python3 changes (bcl@redhat.com) - Update lorax for python3 and argparse (bcl@redhat.com) - Use the execWith* methods from Anaconda (bcl@redhat.com) - Convert pylorax to python3 (bcl@redhat.com) - Clean up some pylint warnings (bcl@redhat.com) - Make sure openssh-clients is installed (#1219398) (bcl@redhat.com) - Add product.img support for s390 templates (dan@danny.cz) - Add some more details about template rendering errors (bcl@redhat.com) - Mock more modules for RTD (bcl@redhat.com) - Mock the selinux package for RTD (bcl@redhat.com) - Added Sphinx Documentation (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 74 ++++++++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 66 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 9fab53d..2ef7dd8 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /lorax-23.6.tar.gz /lorax-23.7.tar.gz /lorax-23.8.tar.gz +/lorax-23.9.tar.gz diff --git a/lorax.spec b/lorax.spec index 37c7610..fb42c5b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: lorax -Version: 23.8 +Version: 23.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -14,7 +14,8 @@ URL: https://github.com/rhinstaller/lorax # tito build --tgz Source0: %{name}-%{version}.tar.gz -BuildRequires: python2-devel +BuildRequires: python3-devel +BuildRequires: python3-pocketlint >= 0.5 Requires: GConf2 Requires: cpio @@ -29,24 +30,27 @@ Requires: glibc Requires: glibc-common Requires: gzip Requires: isomd5sum -Requires: libselinux-python Requires: module-init-tools Requires: parted -Requires: python-mako Requires: squashfs-tools >= 4.2 Requires: util-linux Requires: xz Requires: pigz -Requires: python-kickstart Requires: dracut >= 030 -Requires: python-dnf + +# Python modules +Requires: libselinux-python3 +Requires: python3-mako +Requires: python3-kickstart +Requires: python3-dnf + %if 0%{?fedora} # Fedora specific deps Requires: fedup-dracut Requires: fedup-dracut-plymouth %ifarch x86_64 -Requires: hfsplus-tools +Requires: hfsplus-tools %endif %endif @@ -79,6 +83,26 @@ 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 lmc-virt +Summary: livemedia-creator libvirt dependencies +Requires: lorax = %{version}-%{release} +Requires: libvirt-python3 +Requires: virt-install + +%description lmc-virt +Additional dependencies required by livemedia-creator when using it with virt-install. + +%package lmc-novirt +Summary: livemedia-creator no-virt dependencies +Requires: lorax = %{version}-%{release} +Requires: anaconda-core +Requires: anaconda-tui + +%description lmc-novirt +Additional dependencies required by livemedia-creator when using it with --no-virt +to run Anaconda. + + %prep %setup -q -n %{name}-%{version} @@ -91,10 +115,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files %defattr(-,root,root,-) %license COPYING -%doc AUTHORS README.livemedia-creator README.product +%doc AUTHORS docs/livemedia-creator.rst docs/product-images.rst %doc docs/*ks -%{python_sitelib}/pylorax -%{python_sitelib}/*.egg-info +%{python3_sitelib}/pylorax +%{python3_sitelib}/*.egg-info %{_sbindir}/lorax %{_sbindir}/mkefiboot %{_sbindir}/livemedia-creator @@ -105,7 +129,37 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/* %{_mandir}/man1/*.1* +%files lmc-virt + +%files lmc-novirt + %changelog +* Fri May 15 2015 Brian C. Lane 23.9-1 +- Update execWith* docstrings (bcl@redhat.com) +- livemedia-creator: Update example kickstarts (bcl@redhat.com) +- Update fedora-livemedia.ks example (bcl@redhat.com) +- Include html documentation under docs/html (bcl@redhat.com) +- Switch documentation to python3 (bcl@redhat.com) +- Create html documentation under docs/html/ (bcl@redhat.com) +- livemedia-creator: Catch missing package errors (bcl@redhat.com) +- Update spec for python3 and add subpackages for lmc (bcl@redhat.com) +- Convert to using pocketlint for pylint rules (bcl@redhat.com) +- Convert livemedia-creator to py3 (bcl@redhat.com) +- Convert test-parse-template to py3 (bcl@redhat.com) +- Update image-minimizer for py3 (bcl@redhat.com) +- Change mkefiboot to py3 (bcl@redhat.com) +- Additional python3 changes (bcl@redhat.com) +- Update lorax for python3 and argparse (bcl@redhat.com) +- Use the execWith* methods from Anaconda (bcl@redhat.com) +- Convert pylorax to python3 (bcl@redhat.com) +- Clean up some pylint warnings (bcl@redhat.com) +- Make sure openssh-clients is installed (#1219398) (bcl@redhat.com) +- Add product.img support for s390 templates (dan@danny.cz) +- Add some more details about template rendering errors (bcl@redhat.com) +- Mock more modules for RTD (bcl@redhat.com) +- Mock the selinux package for RTD (bcl@redhat.com) +- Added Sphinx Documentation (bcl@redhat.com) + * Thu Apr 02 2015 Brian C. Lane 23.8-1 - Include cryptsetup in the image (#1208214) (bcl@redhat.com) diff --git a/sources b/sources index 35d4a33..3bbe12f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53ef8d0a4ab9b6fc6ad008a6255c36fb lorax-23.8.tar.gz +1da8278d7474feac45456b0f44a0c409 lorax-23.9.tar.gz