From f2d77d83c3ef15e75d9dedd23d18c08e87820fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 27 Feb 2016 00:12:59 +0100 Subject: [PATCH] libreoffice: fix misinterpretation of libexec path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Came up by oe-cores's libexec path transition - should be compatible to elder branches. Signed-off-by: Andreas Müller --- .../libreoffice/libreoffice.bb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index 595ed2e..abd5add 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -206,26 +206,26 @@ FILES_${PN} += " \ PACKAGE_BEFORE_PN += "${PN}-sdk" FILES_${PN}-sdk = " \ - ${libexecdir}/sdk \ + ${libdir}/libreoffice/sdk \ " INSANE_SKIP_${PN}-sdk += "dev-so staticdev" FILES_${PN}-dbg += " \ - ${libexecdir}/*/.debug \ - ${libexecdir}/*/*/.debug \ - ${libexecdir}/*/*/*/.debug \ + ${libdir}/libreoffice/*/.debug \ + ${libdir}/libreoffice/*/*/.debug \ + ${libdir}/libreoffice/*/*/*/.debug \ " # based http://pkgs.fedoraproject.org/cgit/rpms/libreoffice.git/tree/libreoffice.spec LO_LANGUAGE_FILES = " \ - ${libexecdir}/share/autocorr/*%{1}.dat \ - ${libexecdir}/program/resource/*%{1}.res \ - ${libexecdir}/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \ - ${libexecdir}/share/config/soffice.cfg/*/ui/res/%{1}.zip \ - ${libexecdir}/share/template/%{1} \ - ${libexecdir}/share/registry/Langpack-%{1}.xcd \ - ${libexecdir}/share/registry/res/registry_%{1}.xcd \ - ${libexecdir}/share/registry/res/fcfg_langpack_%{1}.xcd \ + ${libdir}/libreoffice/share/autocorr/*%{1}.dat \ + ${libdir}/libreoffice/program/resource/*%{1}.res \ + ${libdir}/libreoffice/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \ + ${libdir}/libreoffice/share/config/soffice.cfg/*/ui/res/%{1}.zip \ + ${libdir}/libreoffice/share/template/%{1} \ + ${libdir}/libreoffice/share/registry/Langpack-%{1}.xcd \ + ${libdir}/libreoffice/share/registry/res/registry_%{1}.xcd \ + ${libdir}/libreoffice/share/registry/res/fcfg_langpack_%{1}.xcd \ " python lo_do_split_locales() {