Update to 2.0 release.

Change-Id: Ic62f1b0a73836e5f04e6ca0669ed00c38c41f0c2
Signed-off-by: Ossama Othman <ossama.othman@intel.com>

diff --git a/SDL_Core/CMakeLists.txt b/SDL_Core/CMakeLists.txt
index 7b84ddb..156b0f9 100644 (file)
--- a/SDL_Core/CMakeLists.txt
+++ b/SDL_Core/CMakeLists.txt
@@ -15,7 +15,7 @@ set(ARCHIVE_OUTPUT_DIRECTORY ./bin)
 set(CMAKE_CXX_FLAGS "-g3 -ggdb3 -std=gnu++0x -Werror=return-type -Wuninitialized --coverage")
 set(CMAKE_CXX_FLAGS_RELEASE "-s") #It will be appended to CMAKE_CXX_FLAGS in release
 
-add_definitions(-DSDL_LOG4CPLUS_PROPERTIES_FILE="/etc/smartdevicelink/log4cplus.properties")
+add_definitions(-DSDL_LOG4CXX_PROPERTIES_FILE="/etc/smartdevicelink/log4cxx.properties")
 add_definitions(-DSDL_HMI_LINK_FILE="/etc/smartdevicelink/hmi_link")
 add_definitions(-DSDL_HMI_BROWSER_PATH="/usr/bin/MiniBrowser" -DSDL_HMI_BROWSER_ARG0="MiniBrowser" -DSDL_HMI_BROWSER_ARG1="--engine=wayland_egl")
 add_definitions(-DSDL_AUDIO_SAMPLE="/usr/share/smartdevicelink/audio.8bit.wav")

diff --git a/packaging/smartdevicelink.spec b/packaging/smartdevicelink.spec
index 64d7315..f34de51 100644 (file)
--- a/packaging/smartdevicelink.spec
+++ b/packaging/smartdevicelink.spec
@@ -1,6 +1,6 @@
 Name:          smartdevicelink
 Summary:       GENIVI SmartDeviceLink (SDL)
-Version:       0.1
+Version:       2.0
 Release:       1
 Group:         Network & Connectivity/Connection Management
 License:       BSD-3-Clause
@@ -10,6 +10,11 @@ Source1:       %{name}.xml
 Source1001:    %{name}.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(bluez)
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(liblog4cxx)
+BuildRequires: pkgconfig(avahi-client)
+BuildRequires: pkgconfig(libpulse-simple)
 BuildRequires: doxygen
 BuildRequires: fdupes
 Requires(post): /usr/bin/pkg_initdb
@@ -62,27 +67,16 @@ mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}
 install -m 0755 SDL_Core/src/appMain/smartDeviceLinkCore %{buildroot}%{_bindir}
 
-install -m 0755 SDL_Core/src/components/TransportManager/libTransportManager.so %{buildroot}%{_libdir}
-install -m 0755 SDL_Core/src/components/AppMgr/libAppMgr.so %{buildroot}%{_libdir}
-install -m 0755 SDL_Core/src/components/ConnectionHandler/libconnectionHandler.so %{buildroot}%{_libdir}
-install -m 0755 SDL_Core/src/components/JSONHandler/libJSONHandler.so %{buildroot}%{_libdir}
-install -m 0755 SDL_Core/src/components/ProtocolHandler/libProtocolHandler.so %{buildroot}%{_libdir}
-install -m 0755 SDL_Core/src/components/Utils/libUtils.so %{buildroot}%{_libdir}
 install -m 0755 SDL_Core/src/thirdPartyLibs/encryption/libencryption.so %{buildroot}%{_libdir}
-install -m 0755 SDL_Core/src/thirdPartyLibs/logger/log4cplus-1.1.0/src/liblog4cplus.so.1.1.0 %{buildroot}%{_libdir}
 install -m 0755 SDL_Core/src/thirdPartyLibs/MessageBroker/libMessageBrokerClient.so %{buildroot}%{_libdir}
 install -m 0755 SDL_Core/src/thirdPartyLibs/MessageBroker/libMessageBrokerServer.so %{buildroot}%{_libdir}
 install -m 0755 SDL_Core/src/thirdPartyLibs/MessageBroker/libMessageBroker.so %{buildroot}%{_libdir}
 install -m 0755 SDL_Core/src/thirdPartyLibs/jsoncpp/libjsoncpp.so %{buildroot}%{_libdir}
 
-install -m 0644 SDL_Core/src/appMain/log4cplus.properties %{buildroot}%{_sysconfdir}/%{name}
+install -m 0644 SDL_Core/src/appMain/log4cxx.properties %{buildroot}%{_sysconfdir}/%{name}
 install -m 0644 SDL_Core/src/appMain/audio.8bit.wav %{buildroot}%{_datadir}/%{name}
 cp -R SDL_Core/src/components/HMI %{buildroot}%{_datadir}/%{name}
 
-pushd %{buildroot}%{_libdir}
-ln -s liblog4cplus.so.1.1.0 liblog4cplus.so.0
-popd
-
 %fdupes -s %{buildroot}%{_datadir}/%{name}
 
 # Create the 'hmi_link' file with the location of the sample HMI.
@@ -108,7 +102,7 @@ ln -sf %{_datadir}/%{name}/HMI/images/sdl/devices.png %{buildroot}%{_datadir}/ic
 %license LICENSE
 %{_bindir}/smartDeviceLinkCore
 %{_libdir}/*.so*
-%config %{_sysconfdir}/%{name}/log4cplus.properties
+%config %{_sysconfdir}/%{name}/log4cxx.properties
 %{_datadir}/%{name}/audio.8bit.wav
 
 %files sample-hmi