[master 11/18] Update spec for python3 and add subpackages for lmc
bcl
installerbot-noreply at redhat.com
Tue May 12 00:22:01 UTC 2015
From: "Brian C. Lane" <bcl at redhat.com>
This updates things for python3, and adds 2 subpackages to pull in
dependencies needed by lmc when running with virt-install or --no-virt
with anaconda.
---
Makefile | 2 +-
lorax.spec | 44 ++++++++++++++++++++++++++++++++++++--------
setup.py | 7 +++----
3 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 017c008..a0c8033 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= /usr/bin/python
+PYTHON ?= /usr/bin/python3
DESTDIR ?= /
PKGNAME = lorax
diff --git a/lorax.spec b/lorax.spec
index 11d162a..b859dcf 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -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}
@@ -93,8 +117,8 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%license COPYING
%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,6 +129,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/*
%{_mandir}/man1/*.1*
+%files lmc-virt
+
+%files lmc-novirt
+
%changelog
* Thu Apr 02 2015 Brian C. Lane <bcl at redhat.com> 23.8-1
- Include cryptsetup in the image (#1208214) (bcl at redhat.com)
diff --git a/setup.py b/setup.py
index 791ffb8..86b16bc 100644
--- a/setup.py
+++ b/setup.py
@@ -35,10 +35,9 @@
version=vernum,
description="Lorax",
long_description="",
- author="Martin Gracik",
- author_email="mgracik at redhat.com",
- url="http://",
- download_url="http://",
+ author="Martin Gracik, Will Woods <wwoods at redhat.com>, Brian C. Lane <bcl at redhat.com>",
+ url="http://www.github.com/rhinstaller/lorax/",
+ download_url="http://www.github.com/rhinstaller/lorax/releases/",
license="GPLv2+",
packages=["pylorax"],
package_dir={"" : "src"},
--
To view this commit on github, visit https://github.com/rhinstaller/lorax/commit/47ed03902a0a38e1ebe1b907d1c11e91cadf9654
More information about the anaconda-patches
mailing list