From d63dc9a1291646c90f664f59e3abd0670e6e1849 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 26 Sep 2008 09:35:05 +0000
Subject: pidgin: update to 2.5.1, package ca-certs, recommend package with
 icon

---
 packages/pidgin/pidgin.inc      |  3 ++-
 packages/pidgin/pidgin_2.5.0.bb | 17 -----------------
 packages/pidgin/pidgin_2.5.1.bb | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 packages/pidgin/pidgin_2.5.0.bb
 create mode 100644 packages/pidgin/pidgin_2.5.1.bb

(limited to 'packages')

diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc
index d608d8adea..db66d13b20 100644
--- a/packages/pidgin/pidgin.inc
+++ b/packages/pidgin/pidgin.inc
@@ -25,7 +25,7 @@ OE_LT_RPATH_ALLOW[export]="1"
 PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data"
 
 LEAD_SONAME = "libpurple.so.0"
-FILES_libpurple     = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple*"
+FILES_libpurple     = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs"
 FILES_libpurple-dev = "${libdir}/libpurple*.la \
                        ${libdir}/libpurple*.so \
                        ${libdir}/purple-2/*.la \
@@ -44,6 +44,7 @@ FILES_finch-dbg     = "${bindir}/.debug/finch \
 
 FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
 	       ${datadir}/applications"
+RRECOMMENDS_${PN{ += "${PN}-data "
 FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons"
 FILES_${PN}-dev += "${libdir}/${PN}/*.la"
 
diff --git a/packages/pidgin/pidgin_2.5.0.bb b/packages/pidgin/pidgin_2.5.0.bb
deleted file mode 100644
index 65fbc53ffa..0000000000
--- a/packages/pidgin/pidgin_2.5.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require pidgin.inc
-
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-           file://sanitize-configure.ac.patch;patch=1 \
-           file://gconf-no-errors.patch;patch=1 \
-	   file://pidgin.desktop-set-icon.patch;patch=1 \
-	   file://purple-OE-branding-25.patch;patch=1 \
-	   file://pidgin-cross-python.patch;patch=1 \
-	  " 
-
-EXTRA_OECONF += " --disable-gtkspell \
-                  --disable-meanwhile \
-                  --disable-nm \ 
-                  --disable-screensaver \
-                "
diff --git a/packages/pidgin/pidgin_2.5.1.bb b/packages/pidgin/pidgin_2.5.1.bb
new file mode 100644
index 0000000000..dc919eaaf9
--- /dev/null
+++ b/packages/pidgin/pidgin_2.5.1.bb
@@ -0,0 +1,15 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+           file://sanitize-configure.ac.patch;patch=1 \
+           file://gconf-no-errors.patch;patch=1 \
+	   file://pidgin.desktop-set-icon.patch;patch=1 \
+	   file://purple-OE-branding-25.patch;patch=1 \
+	   file://pidgin-cross-python.patch;patch=1 \
+	  " 
+
+EXTRA_OECONF += " --disable-gtkspell \
+                  --disable-meanwhile \
+                  --disable-nm \ 
+                  --disable-screensaver \
+                "
-- 
cgit v1.2.3