summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capi/CMakeLists.txt6
-rw-r--r--client/CMakeLists.txt6
-rw-r--r--packaging/privacy-manager.changes3
-rwxr-xr-xpackaging/privacy-manager.spec24
-rw-r--r--server/CMakeLists.txt2
-rw-r--r--server/src/CMakeLists.txt6
6 files changed, 14 insertions, 33 deletions
diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index 002111c..906fba7 100644
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -4,7 +4,6 @@ SET(fw_name "capi-security-privacy-manager")
PROJECT(${fw_name})
-SET(CMAKE_INSTALL_PREFIX /usr)
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(INC_DIR include)
@@ -32,7 +31,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
ADD_DEFINITIONS("-DSLP_DEBUG")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
aux_source_directory(src SOURCES)
ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
@@ -46,7 +44,7 @@ SET_TARGET_PROPERTIES(${fw_name}
CLEAN_DIRECT_OUTPUT 1
)
-INSTALL(TARGETS ${fw_name} DESTINATION ../lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION ../include/privacymgr
FILES_MATCHING
@@ -66,7 +64,7 @@ SET(PC_CFLAGS -I\${includedir}/privacymgr)
#)
CONFIGURE_FILE(../capi-security-privacy-manager.pc.in capi-security-privacy-manager.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ../lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
IF(UNIX)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 9d3d4e7..98b9409 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(CMAKE_INSTALL_PREFIX /usr)
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
SET(INCLUDEDIR "\${prefix}/include")
INCLUDE(FindPkgConfig)
@@ -79,6 +79,6 @@ SET(PC_CFLAGS -I\${includedir}/privacy_manager)
CONFIGURE_FILE(../privacy-manager-client.pc.in privacy-manager-client.pc @ONLY)
-INSTALL(TARGETS privacy-manager-client DESTINATION ../lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-client.pc DESTINATION ../lib/pkgconfig)
+INSTALL(TARGETS privacy-manager-client DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-client.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
INSTALL(FILES ${PRIVACY_MANAGER_CLIENT_HEADERS} DESTINATION ../include/privacy_manager)
diff --git a/packaging/privacy-manager.changes b/packaging/privacy-manager.changes
new file mode 100644
index 0000000..2bfb38e
--- /dev/null
+++ b/packaging/privacy-manager.changes
@@ -0,0 +1,3 @@
+* Sat May 18 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130517.045140@2a5ab27
+- Fixed build on 64 bit systems
+
diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index 63280b2..d3c3b30 100755
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -105,14 +105,7 @@ The Privacy popup provides UI to set privacy information of application.
%build
#%{!?build_type:%define build_type "Release"}
-echo cmake . -DPREFIX=%{_prefix} \
- -DEXEC_PREFIX=%{_exec_prefix} \
- -DLIBDIR=%{_libdir} \
- -DINCLUDEDIR=%{_includedir} \
- -DCMAKE_BUILD_TYPE=%{build_type} \
- -DVERSION=%{version} \
- -DDPL_LOG="ON"
-cmake . -DPREFIX=%{_prefix} \
+%cmake . -DPREFIX=%{_prefix} \
-DEXEC_PREFIX=%{_exec_prefix} \
-DLIBDIR=%{_libdir} \
-DINCLUDEDIR=%{_includedir} \
@@ -131,21 +124,13 @@ mkdir -p %{buildroot}/usr/bin
cp res/usr/bin/* %{buildroot}/usr/bin/
mkdir -p %{buildroot}/opt/dbspace
cp res/opt/dbspace/.privacylist.db /%{buildroot}/opt/dbspace/
-#mkdir -p %{buildroot}/etc/rc.d/init.d
-#cp res/etc/rc.d/init.d/* %{buildroot}/etc/rc.d/init.d/
%make_install
-#mkdir -p %{buildroot}/etc/rc.d/rc3.d
-#mkdir -p %{buildroot}/etc/rc.d/rc5.d
-#ln -sf /etc/rc.d/init.d/privacy-manager-server.sh %{buildroot}/etc/rc.d/rc3.d/S10privacy-manager-server.sh
-#ln -sf /etc/rc.d/init.d/privacy-manager-server.sh %{buildroot}/etc/rc.d/rc5.d/S10privacy-manager-server.sh
mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
-%clean
-rm -rf %{buildroot}
%post -n privacy-manager-server
/sbin/ldconfig
@@ -157,18 +142,13 @@ then
/usr/bin/privacy_manager_create_clean_db.sh
fi
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -n privacy-manager-server
%defattr(-,root,root,-)
%manifest packaging/privacy-manager-server.manifest
%{_bindir}/*
%{_libdir}/systemd/*
-#/etc/rc.d/init.d/privacy-manager-server.sh
-#%attr(755,root,root) /etc/rc.d/init.d/privacy-manager-server.sh
-#/etc/rc.d/rc3.d/S10privacy-manager-server.sh
-#/etc/rc.d/rc5.d/S10privacy-manager-server.sh
/usr/share/license/privacy-manager-server
/opt/dbspace/.privacylist.db
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 9886864..fd1e15d 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -76,5 +76,5 @@ SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES COMPILE_FLAGS "${PRIVACY
CONFIGURE_FILE(../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)
INSTALL(TARGETS privacy-manager-server DESTINATION ../bin COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ../lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include/privacy_manager/server)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 9aecc40..12f7a8d 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(CMAKE_INSTALL_PREFIX /usr)
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
SET(INCLUDEDIR "\${prefix}/include")
SET(VERSION 0.0)
@@ -68,6 +68,6 @@ SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES VERSION ${VERSION})
CONFIGURE_FILE(../../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)
-INSTALL(TARGETS privacy-manager-server DESTINATION ../lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ../lib/pkgconfig)
+INSTALL(TARGETS privacy-manager-server DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/privacy-manager-server.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
INSTALL(FILES ${PRIVACY_MANAGER_SERVER_HEADERS} DESTINATION ../include)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 00:57:06 +0000