2 commits - liveusb-creator liveusb-creator.spec liveusb/olpc.py setup.py

Luke Macken lmacken at fedoraproject.org
Sat Jan 17 01:54:55 UTC 2009


 liveusb-creator      |    2 +-
 liveusb-creator.spec |    6 +++++-
 liveusb/olpc.py      |    8 ++++----
 setup.py             |    4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 379c7f825c6348d188a93283e9840c7d783dbd02
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Jan 16 20:54:43 2009 -0500

    Fix some typos in the olpc fth boot file

diff --git a/liveusb/olpc.py b/liveusb/olpc.py
index 89613ab..8568590 100644
--- a/liveusb/olpc.py
+++ b/liveusb/olpc.py
@@ -2,7 +2,7 @@
 ofw_config = """\
 \ Boot script for USB boot
 \ Authors: Mitch Bradley <wmb AT laptop DOT org>
-hex  rom-pa fffc7 + 4 \$number drop  h# 2e19 < [if]
+hex  rom-pa fffc7 + 4 $number drop  h# 2e19 < [if]
   patch 2drop erase claim-params
   : high-ramdisk  ( -- )
      cv-load-ramdisk
@@ -27,13 +27,13 @@ hex  rom-pa fffc7 + 4 \$number drop  h# 2e19 < [if]
    else
           " u:"
    then
-   " BOOTPATHDEV" \$set-macro
+   " BOOTPATHDEV" $set-macro
 ;
 
 set-bootpath-dev
 " %s" to boot-file
-" \${BOOTPATHDEV}\syslinux\initrd0.img" expand$ to ramdisk
-" \${BOOTPATHDEV}\syslinux\\vmlinuz0" expand$ to boot-device
+" ${BOOTPATHDEV}\syslinux\initrd0.img" expand$ to ramdisk
+" ${BOOTPATHDEV}\syslinux\\vmlinuz0" expand$ to boot-device
 unfreeze
 boot
 """


commit 4b98e1328157aeda39787481eca6d045caacce5e
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Jan 16 20:19:24 2009 -0500

    3.4

diff --git a/liveusb-creator b/liveusb-creator
index 0c9cc46..da296ec 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -18,7 +18,7 @@
 #
 # Author(s): Luke Macken <lmacken at redhat.com>
 
-__version__ = '3.3'
+__version__ = '3.4'
 
 def parse_args():
     from optparse import OptionParser
diff --git a/liveusb-creator.spec b/liveusb-creator.spec
index 08122e4..5d9e380 100644
--- a/liveusb-creator.spec
+++ b/liveusb-creator.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.3
+Version:        3.4
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -32,6 +32,7 @@ make mo
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__rm} -r liveusb/urlgrabber
 
 # Adjust for console-helper magic
 mkdir -p %{buildroot}%{_sbindir}
@@ -65,6 +66,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
+- Update to 3.4.
+
 * Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.3-2
 - Require python-urlgrabber
 
diff --git a/setup.py b/setup.py
index 03cff56..509b20b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ if sys.platform == 'win32':
 
     setup(
         name = 'liveusb-creator',
-        version = '3.3',
+        version = '3.4',
         packages = ['liveusb', 'liveusb/urlgrabber'],
         scripts = ['liveusb-creator'], 
         license = 'GNU General Public License (GPL)',
@@ -55,7 +55,7 @@ if sys.platform == 'win32':
 else:
     setup(
         name = 'liveusb-creator',
-        version = '3.3',
+        version = '3.4',
         packages = ['liveusb'],
         scripts = ['liveusb-creator'],
         license = 'GNU General Public License (GPL)',




More information about the liveusb-creator mailing list