Fix ug-setting-gallery-efl build into pure Wayland profile.

Change-Id: Id093adf907f4e8301391fd41c22c359167845250
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84c7570..e0cb8dc 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CXXFLAGS}")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 
+IF(WAYLAND_SUPPORT)
+    ADD_DEFINITIONS("-DWAYLAND")
+ENDIF(WAYLAND_SUPPORT)
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})

diff --git a/packaging/ug-setting-gallery-efl.spec b/packaging/ug-setting-gallery-efl.spec
index 2fb2528..5556da7 100755 (executable)
--- a/packaging/ug-setting-gallery-efl.spec
+++ b/packaging/ug-setting-gallery-efl.spec
@@ -1,3 +1,5 @@
+%bcond_with wayland
+
 Name:       ug-setting-gallery-efl
 Summary:    UG setting gallery ELF
 Version:    1.0.43
@@ -35,17 +37,23 @@ cp %{SOURCE1001} .
 
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=%{ARCH}
+LDFLAGS="$LDFLAGS" %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=%{ARCH} \
+%if %{with wayland}
+         -DWAYLAND_SUPPORT=On
+%else
+         -DWAYLAND_SUPPORT=Off
+%endif
+
 
 make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}/usr/share/license
+mkdir -p %{buildroot}%{_datarootdir}/license
 
 %post
 /sbin/ldconfig
-export LD_LIBRARY_PATH=/usr/lib/ug:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=%{_prefix}/lib/ug:$LD_LIBRARY_PATH
 
 /usr/bin/vconftool set -t double db/gallery/setting/interval_time 3.0 -g 6514
 /usr/bin/vconftool set -t bool db/gallery/setting/repeat_state 0 -g 6514
@@ -57,7 +65,7 @@ export LD_LIBRARY_PATH=/usr/lib/ug:$LD_LIBRARY_PATH
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/ug/lib/*
-/usr/ug/res/*
-/usr/share/license/%{name}
+%{_prefix}/ug/lib/*
+%{_prefix}/ug/res/*
+%license %{_datarootdir}/license/%{name}