merge with master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 948b61f..a02ca6c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,8 +46,8 @@ CONFIGURE_FILE(
     @ONLY
 )
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib${LIB_SUFFIX})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/log.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/base/atomic_ref_count.h DESTINATION include/${PROJECT_NAME}/base)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/base/atomicops.h DESTINATION include/${PROJECT_NAME}/base)

diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 8c2014f..a7b7895 100755 (executable)
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -49,9 +49,8 @@
 // code to figure out the message class from its ID.
 enum IPCMessageStart {
   AutomationMsgStart = 0,
-  PushServiceMsgStart,
   CmcStrRegistryManagerStart,
-  LastIPCMsgStart      // Must come last.
+  LastIPCMsgStart
 };
 
 class FilePath;

diff --git a/packaging/chromium.changes b/packaging/chromium.changes
new file mode 100644 (file)
index 0000000..771dbc8
--- /dev/null
+++ b/packaging/chromium.changes
@@ -0,0 +1,2 @@
+* Fri Jan 18 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20121227.051414@062f276
+- Support installation in lib64

diff --git a/packaging/chromium.spec b/packaging/chromium.spec
index c2d7659..3c36bc7 100755 (executable)
--- a/packaging/chromium.spec
+++ b/packaging/chromium.spec
@@ -1,9 +1,9 @@
 Name:       chromium
 Summary:    chromium library
 Version:    1.0
-Release:    2
+Release:    1
 Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
+License:    BSD
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 
@@ -24,9 +24,9 @@ chromium library (devel)
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %ifarch %{ix86}
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" %cmake .  -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %else
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_ARMEL_" %cmake .  -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %endif
 # Call make instruction with smp support
 make %{?jobs:-j%jobs}