From d7eef11e4edbf36fc414c471a5f7edf611fdf430 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Thu, 14 Aug 2014 16:26:40 +0200 Subject: [PATCH] update-desktop-files: update recipe MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also add missing file in package brp-trim-desktopfiles. Change-Id: I91d72a93f7af1621b62bb5d44a634228f8253995 Signed-off-by: Kévin THIERRY --- .../update-desktop-files/update-desktop-files-extraconf.inc | 1 + recipes-tizen/update-desktop-files/update-desktop-files.inc | 12 ++++++------ .../update-desktop-files/update-desktop-files_git.bb | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/recipes-tizen/update-desktop-files/update-desktop-files-extraconf.inc b/recipes-tizen/update-desktop-files/update-desktop-files-extraconf.inc index e69de29..f8fb04f 100644 --- a/recipes-tizen/update-desktop-files/update-desktop-files-extraconf.inc +++ b/recipes-tizen/update-desktop-files/update-desktop-files-extraconf.inc @@ -0,0 +1 @@ +FILES_brp-trim-desktopfiles += "/usr/lib/rpm/brp-tizen.d/brp-70-trim-desktopfiles" diff --git a/recipes-tizen/update-desktop-files/update-desktop-files.inc b/recipes-tizen/update-desktop-files/update-desktop-files.inc index 3c9dfb6..9234a3f 100644 --- a/recipes-tizen/update-desktop-files/update-desktop-files.inc +++ b/recipes-tizen/update-desktop-files/update-desktop-files.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A Build Tool to Update Desktop Files" HOMEPAGE = "http://nohomepage.org" -SECTION = "Development/Tools/Building" +SECTION = "Development/Tools" LICENSE = "GPL-2.0+" SRC_URI = "" @@ -64,10 +64,10 @@ do_install() { rm -rf ${D} mkdir -p ${D} - mkdir -p $RPM_BUILD_ROOT/usr/share/spec2yocto/macro - install -m0755 ${S}/packaging/tizen_update_desktop_file.sh ${S}/packaging/map-desktop-category.sh $RPM_BUILD_ROOT/usr/share/spec2yocto/macro - install -m0644 -D ${S}/packaging/macro $RPM_BUILD_ROOT/etc/rpm/macros.update-desktop-files - install -m0755 -D ${S}/packaging/brp-trim-desktop.sh $RPM_BUILD_ROOT/usr/lib/rpm/brp-tizen.d/brp-70-trim-desktopfiles + mkdir -p ${D}/usr/share/spec2yocto/macro + install -m0755 ${S}/packaging/tizen_update_desktop_file.sh ${S}/packaging/map-desktop-category.sh ${D}/usr/share/spec2yocto/macro + install -m0644 -D ${S}/packaging/macro ${D}${sysconfdir}/rpm/macros.update-desktop-files + install -m0755 -D ${S}/packaging/brp-trim-desktop.sh ${D}${prefix}/lib/rpm/brp-tizen.d/brp-70-trim-desktopfiles } @@ -82,7 +82,7 @@ MANIFESTFILES_brp-trim-desktopfiles = "update-desktop-files.manifest" update-desktop-files_files = "" update-desktop-files_files += "/usr/share/spec2yocto/macro/*" -update-desktop-files_files += "/etc/rpm/*" +update-desktop-files_files += "${sysconfdir}/rpm/*" MANIFESTFILES_${PN} = "update-desktop-files.manifest" FILES_brp-trim-desktopfiles = "${brp-trim-desktopfiles_files}" diff --git a/recipes-tizen/update-desktop-files/update-desktop-files_git.bb b/recipes-tizen/update-desktop-files/update-desktop-files_git.bb index 6c61e25..7c7a931 100644 --- a/recipes-tizen/update-desktop-files/update-desktop-files_git.bb +++ b/recipes-tizen/update-desktop-files/update-desktop-files_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/update-desktop-files;tag=0712f9c0f8b5baffbe82ae63fc0fb8efc4078844;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/update-desktop-files;tag=ca1b55134e1f144f7d06d69e9edb8197a3cfc9e1;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4