dates: unify recipes, fix PV in svn version (from Poky)

diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
new file mode 100644 (file)
index 0000000..fd64084
--- /dev/null
+++ b/packages/pimlico/dates.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Dates is a calendar application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+RDEPENDS = "libedata-cal"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+# EXTRA_OECONF = "--disable-debug"
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
+
+do_install_append () {
+       install -d ${D}/${datadir}/pixmaps
+       install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
+}
+

diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb
index 8dab1db..51d3acc 100644 (file)
--- a/packages/pimlico/dates_0.3.1.bb
+++ b/packages/pimlico/dates_0.3.1.bb
@@ -1,13 +1,5 @@
-DESCRIPTION = "Dates is a calendar application."
-SECTION = "x11"
-LICENSE = "LGPL"
-PR = "r1"
-
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-
-SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz"
+require dates.inc
 
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
+PR = "r1"
 
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"

diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index 162e6f6..474fdde 100644 (file)
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -1,18 +1,8 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-DESCRIPTION = "Dates is a calendar application."
+require dates.inc
 
-PV = "0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.3.1+svn${SRCDATE}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
-
-do_install_append () {
-       install -d ${D}/${datadir}/pixmaps
-       install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
-}