packagekit: respect IPKG_VARIANT in all versions

5 files changed, 10 insertions, 8 deletions

diff --git a/recipes/packagekit/packagekit_0.2.4.bb b/recipes/packagekit/packagekit_0.2.4.bb
index 301853c9e5..544cef21d6 100644
--- a/recipes/packagekit/packagekit_0.2.4.bb
+++ b/recipes/packagekit/packagekit_0.2.4.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "PackageKit package management abstraction"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
-RDEPENDS_${PN} = "opkg"
+DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 ${IPKG_VARIANT} intltool intltool-native (>= 0.37.1)"
+RDEPENDS_${PN} = "${IPKG_VARIANT}"
 
 PE = "1"
+PR = "r1"
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
            file://disable-docbook2man.patch;patch=1 \
diff --git a/recipes/packagekit/packagekit_0.4.6.bb b/recipes/packagekit/packagekit_0.4.6.bb
index d1d2b51814..ca249dd7c6 100644
--- a/recipes/packagekit/packagekit_0.4.6.bb
+++ b/recipes/packagekit/packagekit_0.4.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "PackageKit package management abstraction"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ python cppunit policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
+DEPENDS = "gtk+ python cppunit policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 ${IPKG_VARIANT} intltool intltool-native (>= 0.37.1)"
 RDEPENDS_${PN} = "${IPKG_VARIANT}"
 
 inherit gnome autotools_stage
@@ -12,7 +12,7 @@ SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
            file://opkg-fix-includes.diff;patch=1 \
            file://opkg-fix-declarations.diff;patch=1 "
 
-PR = "r2"
+PR = "r3"
 PE = "1"
 
 S = "${WORKDIR}/PackageKit-${PV}"
diff --git a/recipes/packagekit/packagekit_0.5.2.bb b/recipes/packagekit/packagekit_0.5.2.bb
index 5cc4d9ecb8..5695905d7d 100644
--- a/recipes/packagekit/packagekit_0.5.2.bb
+++ b/recipes/packagekit/packagekit_0.5.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "PackageKit package management abstraction"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ python cppunit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
+DEPENDS = "gtk+ python cppunit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 ${IPKG_VARIANT} intltool intltool-native (>= 0.37.1)"
 RDEPENDS_${PN} = "${IPKG_VARIANT}"
 
 inherit gnome autotools_stage
@@ -10,7 +10,7 @@ inherit gnome autotools_stage
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
            "
 
-PR = "r0"
+PR = "r1"
 PE = "2"
 
 S = "${WORKDIR}/PackageKit-${PV}"
diff --git a/recipes/packagekit/packagekit_0.5.6.bb b/recipes/packagekit/packagekit_0.5.6.bb
index aeca7a316d..171c9722b2 100644
--- a/recipes/packagekit/packagekit_0.5.6.bb
+++ b/recipes/packagekit/packagekit_0.5.6.bb
@@ -8,6 +8,7 @@ RDEPENDS_${PN} = "${IPKG_VARIANT}"
 inherit gnome
 
 PE = "2"
+PR = "r1"
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz;name=archive \
            file://configurefix.patch;patch=1 \
diff --git a/recipes/packagekit/packagekit_git.bb b/recipes/packagekit/packagekit_git.bb
index 14a48b490f..f89779afc7 100644
--- a/recipes/packagekit/packagekit_git.bb
+++ b/recipes/packagekit/packagekit_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "PackageKit package management abstraction"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ python cppunit policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
+DEPENDS = "gtk+ python cppunit policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 ${IPKG_VARIANT} intltool intltool-native (>= 0.37.1)"
 RDEPENDS_${PN} = "${IPKG_VARIANT}"
 
 inherit gnome autotools_stage
@@ -12,7 +12,7 @@ SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
 
 SRCREV = "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
 PV = "0.4.6+git"
-PR = "r0+gitr${SRCREV}"
+PR = "r1+gitr${SRCREV}"
 PE = "1"
 
 S = "${WORKDIR}/git"