Merge branch 'f13' into 'el6'

.gitignore

@@ -1 +1 @@
-livecd-tools-031.tar.bz2
+/livecd-tools-13.2.tar.bz2

livecd-tools.spec

@@ -4,8 +4,9 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 033
-Release: 3%{?dist}
+Version: 13.2
+Release: 1%{?dist}
+Epoch: 1
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
@@ -13,16 +14,17 @@ URL: http://git.fedorahosted.org/git/livecd
 # git clone git://git.fedorahosted.org/livecd
 # cd livecd
 # make dist
-Source0: %{name}-%{version}.tar.bz2
-# Temporary patch until next livecd-tools rollup
-Patch0: gzip.patch
+# scp livecd*.tar.bz2 fedorahosted.org:livecd
+Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: python-imgcreate = %{version}-%{release}
+Requires: python-imgcreate = %{epoch}:%{version}-%{release}
 Requires: mkisofs
 Requires: isomd5sum
 Requires: parted
+Requires: pyparted
 %ifarch %{ix86} x86_64
 Requires: syslinux
+Requires: /sbin/extlinux
 %endif
 %ifarch ppc
 Requires: yaboot
@@ -58,7 +60,6 @@ like live image or appliances.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make
@@ -80,16 +81,103 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/livecd-iso-to-pxeboot
 %{_bindir}/image-creator
 %{_bindir}/liveimage-mount
+%{_bindir}/mkbiarch
 
 %files -n python-imgcreate
 %defattr(-,root,root,-)
-%doc API
+%doc API COPYING
 %dir %{python_sitelib}/imgcreate
 %{python_sitelib}/imgcreate/*.py
 %{python_sitelib}/imgcreate/*.pyo
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Wed Feb 23 2011 Brian C. Lane <bcl@redhat.com> - 13.2-1
+- Version 13.2 (bcl)
+- Print reason for sudden exit (bcl)
+- Fix skipcopy usage with DVD iso (#644194) (bmj001)
+- Move selinux relabel to after %post (#648591) (bcl)
+- Add support for virtio disks to livecd (#672936) (bcl)
+- Check return value on udevadm (#637258) (bcl)
+- Source may be a file or a block device, mount accordingly (bcl)
+- Align start of partition at 1MiB (#668967) (bcl)
+- Check for one big initrd.img (#671900) (bcl)
+- Update documentation for xz availability. (bruno)
+- Change releasever to a command line option (#667474) (bcl)
+- Assign a device-mapper UUID w/ subsystem prefix to the dm snapshot. (dlehman)
+- Fix git URLs to match reality. (dlehman)
+
+* Wed Dec 22 2010 Brian C. Lane <bcl@redhat.com> - 13.1-1
+- Version 13.1 (bcl)
+- Trap copyFile errors (#663849) (fgrose)
+- Create tmpdir if it doesn't exist (#658632) (bcl)
+- Fix partition number selection for MMC bus devices (#587411) (fgrose)
+- Tolerate empty transactions (lkundrak)
+
+* Mon Nov 15 2010 Brian C. Lane <bcl@redhat.com> - 13.0-1
+- Change version for f13-branch (bcl)
+- Misc. fixups (#652522) (fgrose)
+- Set indentation to 4 spaces (#652522) (fgrose)
+- Add a release target (bcl)
+- Pass dracut args during check (#589778) (bcl)
+- Cleanup EOL spaces (#652522) (fgrose)
+- Typo. Need space before ]. (bruno)
+- Add support for timeout and totaltimeout to livecd-iso-to-disk (#531566)
+  (bcl)
+
+* Mon Nov 01 2010 Brian C. Lane <bcl@redhat.com> - 0.3.5-1
+- Converting version number to NVR
+- Removed patches (now included in v0.3.5)
+
+* Sun Sep 26 2010 Bruno Wolff III <bruno@wolff.to> - 034-11
+- Fix live image relabel when compose host has selinux disabled.
+
+* Tue Sep 21 2010 Bruno Wolff III <bruno@wolff.to> - 034-10
+- Document the lzo compressor.
+
+* Thu Sep 16 2010 Bruno Wolff III <bruno@wolff.to> - 034-9
+- Change requires to /sbin/extlinux since that will work with old and new
+  versions of syslinux.
+
+* Thu Sep 16 2010 Bruno Wolff III <bruno@wolff.to> - 034-8
+- extlinux is now in a subpackage that is required by livecd-iso-to-disk
+
+* Tue Sep 14 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 034-7
+- fix background image copying to use new-new logo path
+
+* Tue Sep 14 2010 Bruno Wolff III <bruno@wolff.to> - 034-6
+- One /dev/loop* change had been missed. Backport patch.
+
+* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-5
+- Backport basic video menu label fix
+
+* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-4
+- Backport missing parts of the regex fix patch
+
+* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-3
+- Backported fix for vesa boot menu item
+
+* Sun Sep 12 2010 Bruno Wolff III <bruno@wolff.to> - 034-2
+- mkbiarch needs pyparted
+
+* Sat Sep 11 2010 Bruno Wolff III <bruno@wolff.to> - 034-1
+- A new experimental script for creating live images.
+- Handle partition devices that have a separator character in them.
+- Initial checkin of a new expermiental tool for live backup images.
+- Allow use of stage2 for repos to help with netinst ISOs.
+- Fix issue with using netinst ISOs.
+- Add support for ext4 now that syslinux supports it.
+- Fix for enumerating loop devices using bash 4.1.7.
+- Change --skipcopy to not overwrite other large areas.
+- Add basic video driver option to syslinux/isolinux.
+- Don't create sparse files one byte too large.
+- Display progress information when copying image to USB devices.
+- Set default boot language for USB images to the current locale.
+- Use grep instead of depreceated egrep.
+- Set up locale or there can be problems handling nonascii strings.
+- 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 <bruno@wolff.to> - 033-3
 - The previous update got replaced by the python update; another bump is needed.
 

sources

@@ -1 +1 @@
-c97450474ed17f1e068aaaaf863ddee7  livecd-tools-033.tar.bz2
+3b7f52714b17f8926820b52f8839a40a  livecd-tools-13.2.tar.bz2