From: Stanislav Brabec Date: Wed, 16 Sep 2009 19:35:31 +0000 (+0000) Subject: intltool: Increase INC_PR to replace pre-INC_PR packages in feeds. X-Git-Tag: Release-2010-05/1~2442 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7081e345e4ff3ba1bfdca2484d6dae04a48af1a8;p=openembedded.git intltool: Increase INC_PR to replace pre-INC_PR packages in feeds. --- diff --git a/recipes/intltool/intltool.inc b/recipes/intltool/intltool.inc index 1938407fd0..1de2ae0323 100644 --- a/recipes/intltool/intltool.inc +++ b/recipes/intltool/intltool.inc @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "devel" LICENSE = "GPL" DEPENDS += "libxml-parser-perl-native" -INC_PR = "r2" +INC_PR = "r3" URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" diff --git a/recipes/intltool/intltool_0.30.bb b/recipes/intltool/intltool_0.30.bb index 04bd71fd71..ca4f86eb6f 100644 --- a/recipes/intltool/intltool_0.30.bb +++ b/recipes/intltool/intltool_0.30.bb @@ -1,4 +1,3 @@ require intltool.inc -PR = "${INC_PR}.1" - +PR = "${INC_PR}.0" diff --git a/recipes/intltool/intltool_0.31.bb b/recipes/intltool/intltool_0.31.bb index 04bd71fd71..ca4f86eb6f 100644 --- a/recipes/intltool/intltool_0.31.bb +++ b/recipes/intltool/intltool_0.31.bb @@ -1,4 +1,3 @@ require intltool.inc -PR = "${INC_PR}.1" - +PR = "${INC_PR}.0" diff --git a/recipes/intltool/intltool_0.34.bb b/recipes/intltool/intltool_0.34.bb index 04bd71fd71..ca4f86eb6f 100644 --- a/recipes/intltool/intltool_0.34.bb +++ b/recipes/intltool/intltool_0.34.bb @@ -1,4 +1,3 @@ require intltool.inc -PR = "${INC_PR}.1" - +PR = "${INC_PR}.0" diff --git a/recipes/intltool/intltool_0.35.0.bb b/recipes/intltool/intltool_0.35.0.bb index 6da883212a..efe780c6d9 100644 --- a/recipes/intltool/intltool_0.35.0.bb +++ b/recipes/intltool/intltool_0.35.0.bb @@ -3,4 +3,4 @@ require intltool.inc #RDEPENDS = "libxml-parser-perl" RRECOMMENDS = "perl-modules" -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" diff --git a/recipes/intltool/intltool_0.35.2.bb b/recipes/intltool/intltool_0.35.2.bb index a8e2cf8905..de3c6084d5 100644 --- a/recipes/intltool/intltool_0.35.2.bb +++ b/recipes/intltool/intltool_0.35.2.bb @@ -3,5 +3,4 @@ require intltool.inc RDEPENDS = "perl-module-text-wrap perl-module-re" RRECOMMENDS = "perl-modules" -PR = "${INC_PR}.1" - +PR = "${INC_PR}.0" diff --git a/recipes/intltool/intltool_0.35.5.bb b/recipes/intltool/intltool_0.35.5.bb index 4cb7a794ef..6d3f5270d2 100644 --- a/recipes/intltool/intltool_0.35.5.bb +++ b/recipes/intltool/intltool_0.35.5.bb @@ -3,7 +3,7 @@ require intltool.inc RDEPENDS = "perl-module-text-wrap perl-module-re" RRECOMMENDS = "perl-modules" -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/intltool/intltool_0.37.1.bb b/recipes/intltool/intltool_0.37.1.bb index 04bd71fd71..ca4f86eb6f 100644 --- a/recipes/intltool/intltool_0.37.1.bb +++ b/recipes/intltool/intltool_0.37.1.bb @@ -1,4 +1,3 @@ require intltool.inc -PR = "${INC_PR}.1" - +PR = "${INC_PR}.0" diff --git a/recipes/intltool/intltool_0.40.3.bb b/recipes/intltool/intltool_0.40.3.bb index ddd6f8956d..d906cb787c 100644 --- a/recipes/intltool/intltool_0.40.3.bb +++ b/recipes/intltool/intltool_0.40.3.bb @@ -1,13 +1,13 @@ require intltool.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/perl'" do_configure_prepend() { sed -i -e s:\\\$\(PERL\):\$\(PERL_TARGET\):g Makefile.am -} +} do_configure_append() { - sed -i -e s:head\ -1:head\ -n1:g intltool.m4 -} + sed -i -e s:head\ -1:head\ -n1:g intltool.m4 +}