rpms/livecd-tools/devel gzip.patch, NONE, 1.1 livecd-tools.spec, 1.46, 1.47

[Bruno Wolff III]

Author: bruno

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12247

Modified Files:
	livecd-tools.spec 
Added Files:
	gzip.patch 
Log Message:
A thinko about what squashfs calls gzip compression was pointed out and
livecd-tools was changed to substitute 'gzip' for 'zlib' throughout.
This was committed upstream, but is handled here by a patch until the next
upstream rollup.



gzip.patch:
 docs/livecd-creator.pod |    4 ++--
 imgcreate/fs.py         |    4 ++--
 imgcreate/live.py       |    2 +-
 tools/livecd-creator    |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gzip.patch ---
diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod
index 880ae19..e80a119 100644
--- a/docs/livecd-creator.pod
+++ b/docs/livecd-creator.pod
@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name.
 
 =item --compression-type=COMPRESSOR
 
-Specify a compressor recognized by mksquashfs. The default is zlib. lzma
-currently requires a custom kernel to produce a functional image. If zlib
+Specify a compressor recognized by mksquashfs. The default is gzip. lzma
+currently requires a custom kernel to produce a functional image. If gzip
 is used, the -comp option is not passed to mksquashfs to allow the use of
 older versions of mksquashfs.
 
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index c5cd18b..554d1b9 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -41,8 +41,8 @@ def makedirs(dirname):
             raise
 
 def mksquashfs(in_img, out_img, compress_type):
-# Allow zlib to work for older versions of mksquashfs
-    if compress_type == "zlib":
+# Allow gzip to work for older versions of mksquashfs
+    if compress_type == "gzip":
         args = ["/sbin/mksquashfs", in_img, out_img]
     else:
         args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type]
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 36fef63..f349a1f 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator):
         """
         LoopImageCreator.__init__(self, *args)
 
-        self.compress_type = "zlib"
+        self.compress_type = "gzip"
         """mksquashfs compressor to use."""
 
         self.skip_compression = False
diff --git a/tools/livecd-creator b/tools/livecd-creator
index 79fc944..d1727c5 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -42,8 +42,8 @@ def parse_options(args):
     imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label",
                       help="File system label (default based on config name)")
     imgopt.add_option("", "--compression-type", type="string", dest="compress_type",
-                      help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)",
-                      default="zlib")
+                      help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)",
+                      default="gzip")
     parser.add_option_group(imgopt)
 
     # options related to the config of your system


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- livecd-tools.spec	27 Jul 2010 10:41:58 -0000	1.46
+++ livecd-tools.spec	27 Jul 2010 14:05:39 -0000	1.47
@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 033
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
@@ -14,6 +14,8 @@ URL: http://git.fedorahosted.org/git/liv
 # cd livecd
 # make dist
 Source0: %{name}-%{version}.tar.bz2
+# Temporary patch until next livecd-tools rollup
+Patch0: gzip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -56,6 +58,7 @@ like live image or appliances.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Tue Jul 27 2010 Bruno Wolff III <bruno at wolff.to> - 033-2
+- Replace 'zlib' with 'gzip' to fix thinko about the compressor name.
+
 * Tue Jul 27 2010 Bruno Wolff III <bruno at wolff.to> - 033-1
 - Fix for vesa splash file change for bz 617115.
 - Use lazy umounts as a work around for bz 617844.