From 411cc1a69c8c05bdd8a0b9dab94094d76a2edbe3 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 6 Dec 2016 10:06:00 -0800 Subject: [PATCH] - 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) --- .gitignore | 1 + livecd-tools.spec | 155 ++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 119 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index cd9c454..329db0d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /livecd-tools-23.2.tar.gz /livecd-tools-23.3.tar.gz /livecd-tools-23.4.tar.gz +/livecd-tools-24.0.tar.gz diff --git a/livecd-tools.spec b/livecd-tools.spec index 2d95282..d63fad1 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -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} +# 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 Name: livecd-tools -Version: 23.4 +Version: 24.0 Release: 1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Base URL: https://github.com/rhinstaller/livecd-tools -# To make source tar ball: -# git clone https://github.com/rhinstaller/livecd-tools -# cd livecd-tools -# make dist -Source0: https://github.com/rhinstaller/livecd-tools/archive/%{name}-%{version}.tar.gz -# Drop the requirements for grub2-efi and shim: breaks 32-bit compose -# and not needed as we have them in comps -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: python-imgcreate = %{epoch}:%{version}-%{release} +Source0: %{url}/archive/%{name}-%{version}.tar.gz + +%if %{with python3} +Requires: python3-imgcreate = %{epoch}:%{version}-%{release} +Requires: python3-pyparted +%else +Requires: python2-imgcreate = %{epoch}:%{version}-%{release} +Requires: pyparted +%endif Requires: mkisofs Requires: isomd5sum Requires: parted -Requires: pyparted Requires: util-linux Requires: dosfstools Requires: e2fsprogs @@ -42,52 +46,81 @@ Requires: yaboot Requires: dumpet Requires: sssd-client Requires: cryptsetup -BuildRequires: python +BuildRequires: python2-devel +%if %{with python3} +BuildRequires: python3-devel +%endif BuildRequires: /usr/bin/pod2man -%description +%description Tools for generating live CDs on Fedora based systems including derived distributions such as RHEL, CentOS and others. See http://fedoraproject.org/wiki/FedoraLiveCD for more details. -%package -n python-imgcreate -Summary: Python modules for building system images +%package -n python2-imgcreate +Summary: Python 2 modules for building system images Group: System Environment/Base +%{?python_provide:%python_provide python2-imgcreate} Requires: util-linux Requires: coreutils Requires: e2fsprogs -Requires: yum >= 3.2.18 +Requires: python2-dnf >= 1.1.0 Requires: squashfs-tools Requires: python-kickstart Requires: dosfstools >= 2.11-8 -Requires: system-config-keyboard >= 1.3.0 -Requires: python-urlgrabber +Requires: python-six Requires: libselinux-python Requires: dbus-python Requires: policycoreutils -%description -n python-imgcreate -Python modules that can be used for building images for things +%description -n python2-imgcreate +Python 2 modules that can be used for building images for things 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 -%setup -q +%autosetup -p1 %build -make +# Nothing to do %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +# Install Python 2 stuff +%make_install PYTHON=python2 -%clean -rm -rf $RPM_BUILD_ROOT +%if %{with python3} +# 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 -%defattr(-,root,root,-) -%doc AUTHORS COPYING README HACKING +%license COPYING +%doc AUTHORS README HACKING %doc config/livecd-fedora-minimal.ks %{_mandir}/man*/* %{_bindir}/livecd-creator @@ -98,15 +131,61 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/edit-livecd %{_bindir}/mkbiarch -%files -n python-imgcreate -%defattr(-,root,root,-) -%doc API COPYING -%dir %{python_sitelib}/imgcreate -%{python_sitelib}/imgcreate/*.py -%{python_sitelib}/imgcreate/*.pyo -%{python_sitelib}/imgcreate/*.pyc +%files -n python2-imgcreate +%license COPYING +%doc API +%{python2_sitelib}/imgcreate + +%if %{with python3} +%files -n python3-imgcreate +%license COPYING +%doc API +%{python3_sitelib}/imgcreate +%endif %changelog +* Tue Dec 06 2016 Brian C. Lane - 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 - 23.4-1 - Version 23.4 (bcl) - 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. - Allow creation of SELinux enabled LiveCD from an SELinux disabled system. -* Tue Jul 30 2010 Bruno Wolff III - 033-3 +* Fri Jul 30 2010 Bruno Wolff III - 033-3 - The previous update got replaced by the python update; another bump is needed. * Tue Jul 27 2010 Bruno Wolff III - 033-2 diff --git a/sources b/sources index 13c5471..76ec197 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2119bbd5ca662b486bbd4f43b4fcf404 livecd-tools-23.4.tar.gz +fe2e353ccb4ccd295644a8af3f2490f8 livecd-tools-24.0.tar.gz