@ -1,28 +1,32 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "import distutils.sysconfig as d; print d.get_python_lib()")}
%define debug_package %{nil}
%define debug_package %{nil}
# Use Python 2 on RHEL 7
%if 0%{?rhel} && 0%{?rhel} < 8
%bcond_with python3
%else
%bcond_without python3
%endif
Summary: Tools for building live CDs
Summary: Tools for building live CDs
Name: livecd-tools
Name: livecd-tools
Version: 23.4
Version: 24.0
Release: 1%{?dist}
Release: 1%{?dist}
Epoch: 1
Epoch: 1
License: GPLv2
License: GPLv2
Group: System Environment/Base
Group: System Environment/Base
URL: https://github.com/rhinstaller/livecd-tools
URL: https://github.com/rhinstaller/livecd-tools
# To make source tar ball: Source0: %{url}/archive/%{name}-%{version}.tar.gz
# git clone https://github.com/rhinstaller/livecd-tools
# cd livecd-tools %if %{with python3}
# make dist Requires: python3-imgcreate = %{epoch}:%{version}-%{release}
Source0: https://github.com/rhinstaller/livecd-tools/archive/%{name}-%{version}.tar.gz Requires: python3-pyparted
# Drop the requirements for grub2-efi and shim: breaks 32-bit compo se%el se
# and not needed as we have them in comps Requires: python2-imgcreate = %{epoch}:%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: pyparted
Requires: python-imgcreate = %{epoch}:%{version}-%{release} %endif
Requires: mkisofs
Requires: mkisofs
Requires: isomd5sum
Requires: isomd5sum
Requires: parted
Requires: parted
Requires: pyparted
Requires: util-linux
Requires: util-linux
Requires: dosfstools
Requires: dosfstools
Requires: e2fsprogs
Requires: e2fsprogs
@ -42,52 +46,81 @@ Requires: yaboot
Requires: dumpet
Requires: dumpet
Requires: sssd-client
Requires: sssd-client
Requires: cryptsetup
Requires: cryptsetup
BuildRequires: python
BuildRequires: python2-devel
%if %{with python3}
BuildRequires: python3-devel
%endif
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2man
%description
%description
Tools for generating live CDs on Fedora based systems including
Tools for generating live CDs on Fedora based systems including
derived distributions such as RHEL, CentOS and others. See
derived distributions such as RHEL, CentOS and others. See
http://fedoraproject.org/wiki/FedoraLiveCD for more details.
http://fedoraproject.org/wiki/FedoraLiveCD for more details.
%package -n python-imgcreate
%package -n python2 -imgcreate
Summary: Python modules for building system images
Summary: Python 2 modules for building system images
Group: System Environment/Base
Group: System Environment/Base
%{?python_provide:%python_provide python2-imgcreate}
Requires: util-linux
Requires: util-linux
Requires: coreutils
Requires: coreutils
Requires: e2fsprogs
Requires: e2fsprogs
Requires: yum >= 3.2.18
Requires: python2-dnf >= 1.1.0
Requires: squashfs-tools
Requires: squashfs-tools
Requires: python-kickstart
Requires: python-kickstart
Requires: dosfstools >= 2.11-8
Requires: dosfstools >= 2.11-8
Requires: system-config-keyboard >= 1.3.0
Requires: python-six
Requires: python-urlgrabber
Requires: libselinux-python
Requires: libselinux-python
Requires: dbus-python
Requires: dbus-python
Requires: policycoreutils
Requires: policycoreutils
%description -n python-imgcreate
%description -n python2 -imgcreate
Python modules that can be used for building images for things
Python 2 modules that can be used for building images for things
like live image or appliances.
like live image or appliances.
%if %{with python3}
%package -n python3-imgcreate
Summary: Python 3 modules for building system images
Group: System Environment/Base
%{?python_provide:%python_provide python3-imgcreate}
Requires: util-linux
Requires: coreutils
Requires: e2fsprogs
Requires: python3-dnf >= 1.1.0
Requires: squashfs-tools
Requires: python3-kickstart
Requires: dosfstools >= 2.11-8
Requires: python3-six
Requires: libselinux-python3
Requires: python3-dbus
Requires: policycoreutils
%description -n python3-imgcreate
Python 3 modules that can be used for building images for things
like live image or appliances.
%endif
%prep
%prep
%setup -q
%autosetup -p1
%build
%build
make
# Nothing to do
%install
%install
rm -rf $RPM_BUILD_ROOT
# Install Python 2 stuff
make install DESTDIR=$RPM_BUILD_ROOT
%make_install PYTHON=python2
%clean
%if %{with python3}
rm -rf $RPM_BUILD_ROOT
# Install Python 3 stuff
%make_install PYTHON=python3
%endif
# Delete license file from docs, we'll grab it later
rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING
%files
%files
%defattr(-,root,root,-)
%license COPYING
%doc AUTHORS COPYING README HACKING
%doc AUTHORS README HACKING
%doc config/livecd-fedora-minimal.ks
%doc config/livecd-fedora-minimal.ks
%{_mandir}/man*/*
%{_mandir}/man*/*
%{_bindir}/livecd-creator
%{_bindir}/livecd-creator
@ -98,15 +131,61 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/edit-livecd
%{_bindir}/edit-livecd
%{_bindir}/mkbiarch
%{_bindir}/mkbiarch
%files -n python-imgcreate
%files -n python2-imgcreate
%defattr(-,root,root,-)
%license COPYING
%doc API COPYING
%doc API
%dir %{python_sitelib}/imgcreate
%{python2_sitelib}/imgcreate
%{python_sitelib}/imgcreate/*.py
%{python_sitelib}/imgcreate/*.pyo
%if %{with python3}
%{python_sitelib}/imgcreate/*.pyc
%files -n python3-imgcreate
%license COPYING
%doc API
%{python3_sitelib}/imgcreate
%endif
%changelog
%changelog
* Tue Dec 06 2016 Brian C. Lane <bcl@redhat.com> - 24.0-1
- Remove unused tmpdir parameter in resize2fs(). (fgrose)
- HACKING: Fix mailing list address (ngompa13)
- README: Fix the mailing list reference (ngompa13)
- Check if FirewallD is installed before running ks firewall commands (ngompa13)
- Merge pull request #6 from Conan-Kudo/yumtodbo (kevin.kofler)
- Fixup and update the README (ngompa13)
- Yum -> DNF; ayum -> dbo (ngompa13)
- Properly exclude packages from the install set (ngompa13)
- Merge pull request #3 from Conan-Kudo/warningfix (kevin.kofler)
- logging.warn -> logging.warning (ngompa13)
- Delete any leftover (Kevin)
- Fix error handling in creator.py (Kevin)
- Merge pull request #2 from Conan-Kudo/fixmakefile (kevin.kofler)
- Fix command for creating symlink in Makefile (ngompa13)
- Fix command for getting Python directory in the Makefile (ngompa13)
- Merge pull request #1 from Conan-Kudo/futurize (kevin.kofler)
- Bump version to 24.0 (ngompa13)
- Fix up README (ngompa13)
- More conversion of strings to bytestrings (ngompa13)
- Convert bytestring to string (ngompa13)
- Replace deprecated string.join() with str.join (ngompa13)
- Fix division to be unambiguous (ngompa13)
- Purge all Python < 2.6 exception handling code (ngompa13)
- 'msg' should be 'message' for CreatorError exceptions (ngompa13)
- More string to bytestring conversions (ngompa13)
- Convert string to bytestring (ngompa13)
- Convert result sliced from bytestring into string (ngompa13)
- More declaring bytestrings as bytestrings (ngompa13)
- Replace file() with open() (ngompa13)
- use six module for urllib import (ngompa13)
- Mark byte being written as byte (ngompa13)
- Prepend file:// for local paths that don't have it already (ngompa13)
- Remove unused import for system-config-keyboard (ngompa13)
- Migrate from urlgrabber to urllib for Python 2/3 compatibility (ngompa13)
- Makefile fixes for setting which Python to use (ngompa13)
- Add support for setting Python interpreter to be used (ngompa13)
- Port to Python 2.6+, 3.3+ (ngompa13)
- Port from yum to dnf. (Kevin)
- Add imgcreate/.gitignore (Kevin)
- Disambiguation (PeteLawler)
* Fri Aug 26 2016 Brian C. Lane <bcl@redhat.com> - 23.4-1
* Fri Aug 26 2016 Brian C. Lane <bcl@redhat.com> - 23.4-1
- Version 23.4 (bcl)
- Version 23.4 (bcl)
- yuminst.LiveCDYum.runInstall: import yum.Errors (sandro.bonazzola)
- yuminst.LiveCDYum.runInstall: import yum.Errors (sandro.bonazzola)
@ -592,7 +671,7 @@ rm -rf $RPM_BUILD_ROOT
- Try normal umount before falling back to lazy umount.
- Try normal umount before falling back to lazy umount.
- Allow creation of SELinux enabled LiveCD from an SELinux disabled system.
- Allow creation of SELinux enabled LiveCD from an SELinux disabled system.
* Tue Jul 30 2010 Bruno Wolff III <bruno@wolff.to> - 033-3
* Fri Jul 30 2010 Bruno Wolff III <bruno@wolff.to> - 033-3
- The previous update got replaced by the python update; another bump is needed.
- The previous update got replaced by the python update; another bump is needed.
* Tue Jul 27 2010 Bruno Wolff III <bruno@wolff.to> - 033-2
* Tue Jul 27 2010 Bruno Wolff III <bruno@wolff.to> - 033-2
Brian C. Lane
8 years ago