libpng12: remove prefer version and add it to lsb packagegroup

Because rename libpng_1.2.50 to libpng, remove the perfer verion from
default-versions.inc and add libpng12 to lsb packagegroup.

(From OE-Core rev: 01fa98083df0931e07e8715616dafe600258adba)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 0a5b2f4..53ec2e7 100644 (file)
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -9,6 +9,3 @@ PREFERRED_VERSION_python-native ?= "2.7.3"
 
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
-
-# Set libpng default version for linuxstdbase
-PREFERRED_VERSION_libpng_linuxstdbase ?= "1.2.50"

diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index d692a26..cf04f0f 100644 (file)
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -161,6 +161,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\
     ncurses \
     zlib \
     nspr \
+    libpng12 \
 "
 
 SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"