From: Baptiste DURAND <baptiste.durand@eurogiciel.fr>
Date: Mon, 1 Jul 2013 12:19:26 +0000 (+0200)
Subject: Fix plugins load failure during plugins installation
X-Git-Tag: accepted/tizen/20130912.185104^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4ceb44db72b5d3747a24bb4a503196b1a7dcea5;p=platform%2Fframework%2Fweb%2Fwrt-plugins-tizen.git

Fix plugins load failure during plugins installation

Add library path for wrt-plugins library into ld.so.conf file
to avoid stepLoadPluginLibrary(): Failed to load plugin: /usr/lib64/wrt-plugins/tizen-application/libwrt-plugins-tizen-application.so
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81c8c69..6f54343 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,3 +198,10 @@ FUNCTION(add_plugin)
 ENDFUNCTION()
 
 ADD_SUBDIRECTORY(src)
+
+################################################################################
+# ld configuration file
+
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/wrt-plugins-tizen.conf.in
+               ${PROJECT_SOURCE_DIR}/wrt-plugins-tizen.conf @ONLY)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/wrt-plugins-tizen.conf DESTINATION /etc/ld.so.conf.d/)
diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec
index 35ac175..c1484c7 100755
--- a/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@ -146,15 +146,15 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-%post
-
-%postun
+%post -p  /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %manifest wrt-plugins-tizen.manifest 
 %{_libdir}/wrt-plugins/*
 /usr/etc/tizen-apis/*
+/etc/ld.so.conf.d/wrt-plugins-tizen.conf
 
 %files devel
 %{_includedir}/*
diff --git a/wrt-plugins-tizen.conf.in b/wrt-plugins-tizen.conf.in
new file mode 100644
index 0000000..7c90b05
--- /dev/null
+++ b/wrt-plugins-tizen.conf.in
@@ -0,0 +1,22 @@
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-tizen
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-timeutil
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-systemsetting
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-systeminfo
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-secureelement
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-power
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-package
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-notification
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-nfc
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-networkbearerselection
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-log
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-filesystem
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-download
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-datasync
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-datacontrol
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-content
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-contact
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-calendar
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-bookmark
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-bluetooth
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-application
+@LIB_INSTALL_DIR@/wrt-plugins/tizen-alarm