Fixed hardcoding of lib path in .pc file

Change-Id: If6405ae07de43e7489bd36e1bd51b7cb1d2c6191

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b67f39c..9657830 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ SET(VERSION 1.1)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Build type : Release

diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec
index f9933ae..24de966 100755 (executable)
--- a/packaging/syspopup.spec
+++ b/packaging/syspopup.spec
@@ -1,14 +1,10 @@
-
 Name:       syspopup
 Summary:    syspopup package
 Version:    0.0.89
 Release:    1
 Group:      System/Libraries
-License:    Apache License, Version 2.0
+License:    Apache-2.0
 Source0:    syspopup-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(post): /bin/touch
-Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(bundle)
@@ -70,8 +66,7 @@ rm -rf %{buildroot}/usr/share/syspopup/syspopup_db.sql
 
 touch %{buildroot}%{_datadir}/popup_noti_term
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 

diff --git a/syspopup-caller/syspopup-caller.pc.in b/syspopup-caller/syspopup-caller.pc.in
index c3fc022..c9db181 100644 (file)
--- a/syspopup-caller/syspopup-caller.pc.in
+++ b/syspopup-caller/syspopup-caller.pc.in
@@ -2,7 +2,7 @@
 
 prefix=/usr
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: libsyspopup_caller

diff --git a/syspopup/CMakeLists.txt b/syspopup/CMakeLists.txt
index 72a0929..f7862be 100644 (file)
--- a/syspopup/CMakeLists.txt
+++ b/syspopup/CMakeLists.txt
@@ -8,7 +8,6 @@ SET(VERSION 1.1)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Build type : Release