- Version 18.11 (bcl)

- not copying UEFI files shouldn't be fatal (#856893) (bcl)
- don't require shim and grub2-efi (#856893) (bcl)
This commit is contained in:
Brian C. Lane 2012-09-13 14:06:55 -07:00
parent 9c12726cd9
commit 4ed7e7fe5e
4 changed files with 9 additions and 17 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ livecd-tools-033.tar.bz2
/livecd-tools-18.8.tar.bz2
/livecd-tools-18.9.tar.bz2
/livecd-tools-18.10.tar.bz2
/livecd-tools-18.11.tar.bz2

View File

@ -1,12 +0,0 @@
--- livecd-tools-18.10/imgcreate/live.py 2012-09-06 16:38:20.000000000 -0700
+++ livecd-tools-18.10/imgcreate/live.py.new 2012-09-12 20:29:23.006686900 -0700
@@ -400,8 +400,7 @@
return options
def _get_required_packages(self):
- return ["syslinux", "grub2-efi", "shim"] \
- + LiveImageCreatorBase._get_required_packages(self)
+ return ["syslinux"] + LiveImageCreatorBase._get_required_packages(self)
def _get_isolinux_stanzas(self, isodir):
return ""

View File

@ -4,8 +4,8 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 18.10
Release: 2%{?dist}
Version: 18.11
Release: 1%{?dist}
Epoch: 1
License: GPLv2
Group: System Environment/Base
@ -18,7 +18,6 @@ URL: http://git.fedorahosted.org/git/livecd
Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
# Drop the requirements for grub2-efi and shim: breaks 32-bit compose
# and not needed as we have them in comps
Patch0: livecd-tools-18.10-efi_requires.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
Requires: mkisofs
@ -69,7 +68,6 @@ like live image or appliances.
%prep
%setup -q
%patch0 -p1
%build
make
@ -103,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/imgcreate/*.pyc
%changelog
* Thu Sep 13 2012 Brian C. Lane <bcl@redhat.com> 18.11-1
- Version 18.11 (bcl)
- not copying UEFI files shouldn't be fatal (#856893) (bcl)
- don't require shim and grub2-efi (#856893) (bcl)
* Wed Sep 12 2012 Adam Williamson <awilliam@redhat.com> 18.10-2
- efi_requires.patch: don't force grub2-efi and shim into the package
list, it breaks 32-bit compose and isn't needed, we have it in comps

View File

@ -1 +1 @@
f94f9a3536ea77de815fae06fcaa6166 livecd-tools-18.10.tar.bz2
f05cb1d8a2d1f5223026de3249445735 livecd-tools-18.11.tar.bz2