From f481c5dd3954fcc80cedea960b5e2faa96971200 Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Tue, 6 Jul 2010 14:00:57 +0800
Subject: zip: upgrade to version 3.0

from 2.32

update S in 3.0

Signed-off-by: Qing He <qing.he@intel.com>
---
 meta/packages/zip/zip.inc     | 5 ++++-
 meta/packages/zip/zip_2.32.bb | 3 ---
 meta/packages/zip/zip_3.0.bb  | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 meta/packages/zip/zip_2.32.bb
 create mode 100644 meta/packages/zip/zip_3.0.bb

(limited to 'meta/packages/zip')

diff --git a/meta/packages/zip/zip.inc b/meta/packages/zip/zip.inc
index 7593d924a..9a269ea89 100644
--- a/meta/packages/zip/zip.inc
+++ b/meta/packages/zip/zip.inc
@@ -1,8 +1,11 @@
 DESCRIPTION = "Archiver for .zip files"
+HOMEPAGE = "http://www.info-zip.org"
 SECTION = "console/utils"
+
 LICENSE = "Info-ZIP"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
 
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tgz"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
 		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
diff --git a/meta/packages/zip/zip_2.32.bb b/meta/packages/zip/zip_2.32.bb
deleted file mode 100644
index 4e01db84c..000000000
--- a/meta/packages/zip/zip_2.32.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require zip.inc
-
-PR="r1"
diff --git a/meta/packages/zip/zip_3.0.bb b/meta/packages/zip/zip_3.0.bb
new file mode 100644
index 000000000..c5df637a3
--- /dev/null
+++ b/meta/packages/zip/zip_3.0.bb
@@ -0,0 +1,6 @@
+require zip.inc
+
+PR="r0"
+
+# zip-2.32 still uses directory name of zip-2.30
+S = "${WORKDIR}/zip30"
-- 
cgit v1.2.3