From e58dd0903dc547b2b19611290eff37c51a726fb4 Mon Sep 17 00:00:00 2001 From: ronan Date: Fri, 15 Feb 2013 11:18:31 +0100 Subject: [PATCH] - Change libsmack to smack. glib-2.0 to glib --- Tizen_TZ_package/create-package-initial.py | 6 +++++- meta-tizen/recipes-BaseSystem/connman/connman-depends.inc | 2 +- meta-tizen/recipes-BaseSystem/rpm/rpm-depends.inc | 2 +- meta-tizen/recipes-Development/pacrunner/pacrunner-depends.inc | 2 +- meta-tizen/recipes-Development/pulseaudio/pulseaudio-depends.inc | 2 +- meta-tizen/recipes-Development/pulseaudio/pulseaudio.inc | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Tizen_TZ_package/create-package-initial.py b/Tizen_TZ_package/create-package-initial.py index fb58a9a..25cbb24 100755 --- a/Tizen_TZ_package/create-package-initial.py +++ b/Tizen_TZ_package/create-package-initial.py @@ -314,7 +314,11 @@ def cleanPackageLine(packageLine): if len(buildRequires)>0: tmp=buildRequires[0] - + if tmp == "libsmack": + tmp="smack" + elif tmp == "glib-2.0": + tmp="glib" + p=[] tmpRes=None diff --git a/meta-tizen/recipes-BaseSystem/connman/connman-depends.inc b/meta-tizen/recipes-BaseSystem/connman/connman-depends.inc index 36af7f4..f951bde 100644 --- a/meta-tizen/recipes-BaseSystem/connman/connman-depends.inc +++ b/meta-tizen/recipes-BaseSystem/connman/connman-depends.inc @@ -1,7 +1,7 @@ DEPENDS = "" #DEPENDS of connman DEPENDS += "dbus" -DEPENDS += "glib-2.0" +DEPENDS += "glib" DEPENDS += "libiptc" DEPENDS += "xtables" DEPENDS += "gnutls" diff --git a/meta-tizen/recipes-BaseSystem/rpm/rpm-depends.inc b/meta-tizen/recipes-BaseSystem/rpm/rpm-depends.inc index db0ee49..288d6e0 100644 --- a/meta-tizen/recipes-BaseSystem/rpm/rpm-depends.inc +++ b/meta-tizen/recipes-BaseSystem/rpm/rpm-depends.inc @@ -24,4 +24,4 @@ DEPENDS += "nss" DEPENDS += "uthash" DEPENDS += "libxml2" DEPENDS += "attr" -DEPENDS += "libsmack" +DEPENDS += "smack" diff --git a/meta-tizen/recipes-Development/pacrunner/pacrunner-depends.inc b/meta-tizen/recipes-Development/pacrunner/pacrunner-depends.inc index e584d4d..10e9d0e 100644 --- a/meta-tizen/recipes-Development/pacrunner/pacrunner-depends.inc +++ b/meta-tizen/recipes-Development/pacrunner/pacrunner-depends.inc @@ -2,5 +2,5 @@ DEPENDS = "" #DEPENDS of pacrunner DEPENDS += "v8-devel" DEPENDS += "dbus" -DEPENDS += "glib-2.0" +DEPENDS += "glib" DEPENDS += "curl" diff --git a/meta-tizen/recipes-Development/pulseaudio/pulseaudio-depends.inc b/meta-tizen/recipes-Development/pulseaudio/pulseaudio-depends.inc index f5b8fcf..35bcb66 100644 --- a/meta-tizen/recipes-Development/pulseaudio/pulseaudio-depends.inc +++ b/meta-tizen/recipes-Development/pulseaudio/pulseaudio-depends.inc @@ -22,5 +22,5 @@ DEPENDS += "xtst" DEPENDS += "dbus" DEPENDS += "libcap" DEPENDS += "orc" -DEPENDS += "glib-2.0" +DEPENDS += "glib" DEPENDS += "json" diff --git a/meta-tizen/recipes-Development/pulseaudio/pulseaudio.inc b/meta-tizen/recipes-Development/pulseaudio/pulseaudio.inc index 8d9afde..b49ab98 100644 --- a/meta-tizen/recipes-Development/pulseaudio/pulseaudio.inc +++ b/meta-tizen/recipes-Development/pulseaudio/pulseaudio.inc @@ -108,7 +108,7 @@ RDEPENDS_libpulse-devel += "libpulse" # the RDEPENDS rules is ignore "libpulse-mainloop-glib = 2.1" RDEPENDS_libpulse-devel += "libpulse-mainloop-glib" RDEPENDS_libpulse-devel += "pkgconfig" -RDEPENDS_libpulse-devel += "glib-2.0" +RDEPENDS_libpulse-devel += "glib" #RDEPENDS of pulseaudio-gdm-hooks # the RDEPENDS rules is ignore "pulseaudio = 2.1" -- 2.7.4