Clean Post section, add ld conf file.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d4b5c7..843b3d5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,6 +159,14 @@ configure_and_install_pkg(wrt-plugins-api-support.pc)
 configure_and_install_pkg(wrt-plugins-ipc-message.pc)
 
 ################################################################################
+# ld configuration file
+
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/${PACKAGE_NAME}.conf.in
+               ${PROJECT_SOURCE_DIR}/${PACKAGE_NAME}.conf @ONLY)
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/${PACKAGE_NAME}.conf DESTINATION /etc/ld.so.conf.d/)
+
+
+################################################################################
 # Cache
 
 set(PLATFORM "${PLATFORM}" CACHE STRING "Target platform" FORCE)

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index a6a2d55..052c349 100644 (file)
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -59,18 +59,12 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 rm -rf %{buildroot}
 
 %post
-if [ ! -e "/etc/ld.so.conf.d" ]; then
-mkdir -p /etc/ld.so.conf.d
-fi 
-echo "%{_libdir}/wrt-plugins/w3c-widget-interface" >> /etc/ld.so.conf.d/wrt-plugins-common.conf
 mkdir -p %{_libdir}/wrt-plugins
 mkdir -p /usr/etc/wrt/injected-javascript
 touch /opt/share/widget/plugin-installation-required
 /sbin/ldconfig
 
-%postun
-rm /etc/ld.so.conf.d/wrt-plugins-common.conf
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %manifest wrt-plugins-common.manifest
@@ -91,6 +85,7 @@ rm /etc/ld.so.conf.d/wrt-plugins-common.conf
     %attr(755,root,root) %{_bindir}/widgetdb_tests_prepare_db.sh
     %attr(755,root,root) %{_bindir}/wrt-plugins-common-tests-widgetdb
 %endif
+/etc/ld.so.conf.d/wrt-plugins-common.conf
 
 %files devel
 %{_includedir}/*

diff --git a/wrt-plugins-common.conf.in b/wrt-plugins-common.conf.in
new file mode 100644 (file)
index 0000000..4f4792d
--- /dev/null
+++ b/wrt-plugins-common.conf.in
@@ -0,0 +1 @@
+@LIB_INSTALL_DIR@/wrt-plugins/w3c-widget-interface