Revert "Revert "Fixed build on x86_64.""

This reverts commit a59e080a99d9912cf44d5e7003ea9f6d2221a1a4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23eba3e..f774890 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,5 +79,5 @@ ADD_DEPENDENCIES(${PROJECT_NAME} ps-iface-context-glue.h)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/ps-plugin.conf DESTINATION ${SYSCONFDIR}/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db_data.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
-INSTALL(TARGETS ps-plugin LIBRARY DESTINATION lib/telephony/plugins)
+INSTALL(TARGETS ps-plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR}/telephony/plugins)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-packetservice)

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 9b3987e..4719d6e 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -1,7 +1,6 @@
-#sbs-git:slp/pkgs/t/tel-plugin-packetservice
 Name:       tel-plugin-packetservice
 Summary:    Telephony Packet Service library
-Version: 0.1.34
+Version:    0.1.34
 Release:    1
 Group:      System/Libraries
 License:    Apache
@@ -22,7 +21,7 @@ Telephony Packet Service library
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DSYSCONFDIR=%{_sysconfdir}
+%cmake . -DSYSCONFDIR=%{_sysconfdir}
 make %{?jobs:-j%jobs}
 
 %post 
@@ -43,12 +42,12 @@ rm -f /usr/share/ps-plugin/dnet_db_data.sql
 #change file permission
 if [ -f /opt/dbspace/.dnet.db ]
 then
-       chmod 660 /opt/dbspace/.dnet.db
+  chmod 660 /opt/dbspace/.dnet.db
 fi
 
 if [ -f /opt/dbspace/.dnet.db-journal ]
 then
-       chmod 664 /opt/dbspace/.dnet.db-journal
+  chmod 664 /opt/dbspace/.dnet.db-journal
 fi
 
 %postun -p /sbin/ldconfig
@@ -60,7 +59,6 @@ mkdir -p %{buildroot}/usr/share/license
 %files
 %manifest tel-plugin-packetservice.manifest
 %defattr(-,root,root,-)
-#%doc COPYING
 /usr/share/ps-plugin/dnet_db.sql
 /usr/share/ps-plugin/dnet_db_data.sql
 %{_sysconfdir}/dbus-1/system.d/*