popt: upgrade to 1.13

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

5 files changed, 12 insertions, 17 deletions

diff --git a/meta/packages/popt/popt-1.7/intl.patch b/meta/packages/popt/popt-1.13/intl.patch
index a7becb1b1a..a7becb1b1a 100644
--- a/meta/packages/popt/popt-1.7/intl.patch
+++ b/meta/packages/popt/popt-1.13/intl.patch
diff --git a/meta/packages/popt/popt-1.7/m4.patch b/meta/packages/popt/popt-1.13/m4.patch
index 2a9b2a64f1..2a9b2a64f1 100644
--- a/meta/packages/popt/popt-1.7/m4.patch
+++ b/meta/packages/popt/popt-1.13/m4.patch
diff --git a/meta/packages/popt/popt-native_1.7.bb b/meta/packages/popt/popt-native_1.13.bb
index 75b90d0763..75b90d0763 100644
--- a/meta/packages/popt/popt-native_1.7.bb
+++ b/meta/packages/popt/popt-native_1.13.bb
diff --git a/meta/packages/popt/popt_1.13.bb b/meta/packages/popt/popt_1.13.bb
new file mode 100644
index 0000000000..619af42a43
--- /dev/null
+++ b/meta/packages/popt/popt_1.13.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The popt library for parsing command line options."
+LICENSE = "MIT"
+SECTION = "libs"
+DEPENDS = "gettext-native"
+
+SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz"
+
+inherit autotools
+
+do_stage () {
+	 autotools_stage_all
+}
diff --git a/meta/packages/popt/popt_1.7.bb b/meta/packages/popt/popt_1.7.bb
deleted file mode 100644
index 137b6744dc..0000000000
--- a/meta/packages/popt/popt_1.7.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "The popt library exists essentially \
-for parsing command line options."
-LICENSE = "MIT"
-SECTION = "libs"
-DEPENDS = "gettext-native"
-PR = "r4"
-
-SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
-	   file://m4.patch;patch=1 \
-	   file://intl.patch;patch=1"
-
-inherit autotools
-
-do_stage () {
-	oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
-	install -m 0644 popt.h ${STAGING_INCDIR}/
-}