zip: updated to 2.32 (from OE) and cleaned

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1437 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 10 insertions, 4 deletions

diff --git a/meta/packages/zip/zip-native_2.31.bb b/meta/packages/zip/zip-native_2.32.bb
index fde61efcb7..cfa4272378 100644
--- a/meta/packages/zip/zip-native_2.31.bb
+++ b/meta/packages/zip/zip-native_2.32.bb
@@ -1,6 +1,7 @@
-SECTION = "console/utils"
-inherit native
 require zip_${PV}.bb
+
+inherit native
+
 S = "${WORKDIR}/zip-${PV}"
 
 do_stage() {
diff --git a/meta/packages/zip/zip_2.31.bb b/meta/packages/zip/zip.inc
index 6c588a55e5..8d04bd5f61 100644
--- a/meta/packages/zip/zip_2.31.bb
+++ b/meta/packages/zip/zip.inc
@@ -1,6 +1,9 @@
+DESCRIPTION = "Archiver for .zip files"
 SECTION = "console/utils"
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz"
 LICENSE = "Info-ZIP"
+
+SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+
 EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
                 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
                 'BINFLAGS=0755' 'INSTALL_D=install -d'"
@@ -14,4 +17,3 @@ do_install() {
                    BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
                    install
 }
-
diff --git a/meta/packages/zip/zip_2.32.bb b/meta/packages/zip/zip_2.32.bb
new file mode 100644
index 0000000000..4e01db84c7
--- /dev/null
+++ b/meta/packages/zip/zip_2.32.bb
@@ -0,0 +1,3 @@
+require zip.inc
+
+PR="r1"