fixed build on x86_64 and clean up CFLAGS

Change-Id: I5ee21980a6b9ae57cba0f3c101ada88425abb2f5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebd300c..9f68f83 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,11 +79,11 @@ CONFIGURE_FILE(appsvc.pc.in appsvc.pc @ONLY)
 
 
 ### Install ###
-INSTALL(TARGETS appsvc DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS appsvc DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(TARGETS ${AVATAR_NAME} DESTINATION bin)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/appsvc.h DESTINATION include/appsvc)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/appsvc.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/appsvc.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/appsvc_db.sql DESTINATION /opt/share )
 

diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec
index ab21033..7710ef0 100644 (file)
--- a/packaging/app-svc.spec
+++ b/packaging/app-svc.spec
@@ -1,4 +1,3 @@
-#sbs-git:slp/pkgs/a/app-svc app-svc 0.1.19 de68cdc468eaded317b4f5be9cdafebb01639aa0
 Name:      app-svc
 Summary:    App svc
 Version: 0.1.42
@@ -43,13 +42,10 @@ App svc (developement files)
 
 
 %build
-
-CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=/usr
-
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 
@@ -74,13 +70,13 @@ chsmack -a 'app-svc::db' /opt/dbspace/.appsvc.db-journal
 %defattr(-,root,root,-)
 /opt/share/appsvc_db.sql
 /usr/bin/appsvc_test
-/usr/lib/libappsvc.so.0
-/usr/lib/libappsvc.so.0.1.0
+%{_libdir}/libappsvc.so.0
+%{_libdir}/libappsvc.so.0.1.0
 
 %files devel
 %defattr(-,root,root,-)
-/usr/lib/pkgconfig/appsvc.pc
-/usr/lib/libappsvc.so
+%{_libdir}/pkgconfig/appsvc.pc
+%{_libdir}/libappsvc.so
 /usr/include/appsvc/appsvc.h