%global __provides_exclude_from ^.*\\.(wearable|mobile|tv|ivi|common)$
%endif
-Name: dali-adaptor
+Name: dali2-adaptor
Summary: The DALi Tizen Adaptor
-Version: 1.4.40
+Version: 1.9.11
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(ttrace)
-BuildRequires: dali-devel
-BuildRequires: dali-integration-devel
+BuildRequires: dali2-devel
+BuildRequires: dali2-integration-devel
BuildRequires: pkgconfig
BuildRequires: gawk
+BuildRequires: cmake
BuildRequires: giflib-devel
BuildRequires: pkgconfig(fontconfig)
BuildRequires: libjpeg-turbo-devel
BuildRequires: wayland-devel
BuildRequires: wayland-extension-client-devel
-# dali-adaptor uses ecore mainloop
+# We use ecore mainloop
%if 0%{?tizen_version_major} >= 5
BuildRequires: pkgconfig(ecore-wl2)
BuildRequires: pkgconfig(wayland-egl-tizen)
BuildRequires: pkgconfig(ecore-wayland)
%endif
-# dali-adaptor needs tbm_surface in tizen 3.0 wayland
+# We need tbm_surface in tizen 3.0 wayland
BuildRequires: pkgconfig(libtbm)
-BuildRequires: pkgconfig(tpkp-curl)
-
-# for dali-adaptor
+# for the adaptor
BuildRequires: pkgconfig(appcore-ui)
BuildRequires: pkgconfig(appcore-widget-base)
BuildRequires: pkgconfig(bundle)
Conflicts: %{name}-profile_wearable
Conflicts: %{name}-profile_ivi
Conflicts: %{name}-profile_common
+Requires: %{name}
%description profile_mobile
The DALi Tizen Adaptor for mobile.
%endif
Conflicts: %{name}-profile_wearable
Conflicts: %{name}-profile_ivi
Conflicts: %{name}-profile_common
+Requires: %{name}
%description profile_tv
The DALi Tizen Adaptor for tv.
%endif
Conflicts: %{name}-profile_tv
Conflicts: %{name}-profile_ivi
Conflicts: %{name}-profile_common
+Requires: %{name}
%description profile_wearable
The DALi Tizen Adaptor for wearable.
%endif
Conflicts: %{name}-profile_wearable
Conflicts: %{name}-profile_tv
Conflicts: %{name}-profile_common
+Requires: %{name}
%description profile_ivi
The DALi Tizen Adaptor for ivi.
%endif
Conflicts: %{name}-profile_wearable
Conflicts: %{name}-profile_tv
Conflicts: %{name}-profile_ivi
+Requires: %{name}
%description profile_common
The DALi Tizen Adaptor for common.
%endif
##############################
# Dali Feedback Plugin
##############################
-%package dali-feedback-plugin
+%package dali2-feedback-plugin
Summary: Plugin to play haptic and audio feedback for Dali
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
-%description dali-feedback-plugin
+%description dali2-feedback-plugin
Feedback plugin to play haptic and audio feedback for Dali
##############################
%define user_shader_cache_dir %{dali_data_ro_dir}/core/shaderbin/
%define dali_plugin_sound_files /plugins/sounds/
-%define dev_include_path %{_includedir}
##############################
# Build
CFLAGS+=" -DWAYLAND"
CXXFLAGS+=" -DWAYLAND"
-configure_flags="--enable-wayland"
+cmake_flags=" -DENABLE_WAYLAND=ON"
# Use this conditional when Tizen version is 5.x or greater
%if 0%{?tizen_version_major} >= 5
# Need Ecore-Wayland2 when Tizen version is 5.x or greater
CFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT"
CXXFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT"
-configure_flags+=" --enable-ecore-wayland2"
+cmake_flags+=" -DENABLE_ECORE_WAYLAND2=ON"
+%endif
+
+%if 0%{?enable_debug}
+cmake_flags+=" -DCMAKE_BUILD_TYPE=Debug"
+%endif
+
+%if 0%{?enable_trace}
+cmake_flags+=" -DENABLE_TRACE=ON"
+%endif
+
+%if 0%{?enable_appfw}
+cmake_flags+=" -DUSE_APPFW"
%endif
libtoolize --force
cd %{_builddir}/%{name}-%{version}/build/tizen
-autoreconf --install
DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TIZEN_PLATFORM_CONFIG_SUPPORTED
%endif
-# Set up the build via configure.
+cmake_flags+=" -DCMAKE_INSTALL_PREFIX=$PREFIX"
+cmake_flags+=" -DCMAKE_INSTALL_LIBDIR=%{_libdir}"
+cmake_flags+=" -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}"
+cmake_flags+=" -DENABLE_TIZEN_MAJOR_VERSION=%{tizen_version_major}"
+cmake_flags+=" -DENABLE_FEEDBACK=YES"
+cmake_flags+=" -DENABLE_APPFW=YES"
+
+# Set up the build via Cmake
#######################################################################
# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if mobile || "undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-%configure --prefix=$PREFIX --with-jpeg-turbo \
- --enable-shaderbincache=DISABLE --enable-profile=MOBILE \
- --enable-tizen-major-version=%{tizen_version_major} \
- --enable-feedback \
- --enable-efl=no \
-%if 0%{?enable_debug}
- --enable-debug \
-%endif
-%if 0%{?enable_trace}
- --enable-trace \
-%endif
- --enable-appfw=yes \
- $configure_flags --libdir=%{_libdir} \
- --enable-rename-so=no
-# Build.
-make %{?jobs:-j%jobs}
+mkdir mobile
+pushd mobile
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
+cmake -DENABLE_PROFILE=MOBILE $cmake_flags ..
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.mobile"; done
-for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
+# Build.
+make %{?jobs:-j%jobs}
popd
-make clean
-
%endif
#######################################################################
# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if tv ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
-%configure --prefix=$PREFIX --with-jpeg-turbo \
- --enable-shaderbincache=DISABLE --enable-profile=TV \
- --enable-tizen-major-version=%{tizen_version_major} \
- --enable-feedback \
- --enable-efl=no \
-%if 0%{?enable_debug}
- --enable-debug \
-%endif
-%if 0%{?enable_trace}
- --enable-trace \
-%endif
- --enable-appfw=yes \
- $configure_flags --libdir=%{_libdir} \
- --enable-rename-so=no
-# Build.
-make %{?jobs:-j%jobs}
+mkdir tv
+pushd tv
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
+cmake -DENABLE_PROFILE=TV $cmake_flags ..
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.tv"; done
-for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
+# Build.
+make %{?jobs:-j%jobs}
popd
-make clean
%endif
#######################################################################
# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if wearable || "undefined"
%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-%configure --prefix=$PREFIX --with-jpeg-turbo \
- --enable-shaderbincache=DISABLE --enable-profile=WEARABLE \
- --enable-tizen-major-version=%{tizen_version_major} \
- --enable-feedback \
- --enable-efl=no \
-%if 0%{?enable_debug}
- --enable-debug \
-%endif
-%if 0%{?enable_trace}
- --enable-trace \
-%endif
- --enable-appfw=yes \
- $configure_flags --libdir=%{_libdir} \
- --enable-rename-so=no
-# Build.
-make %{?jobs:-j%jobs}
+mkdir wearable
+pushd wearable
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
+cmake -DENABLE_PROFILE=WEARABLE $cmake_flags ..
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.wearable"; done
-for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
+# Build.
+make %{?jobs:-j%jobs}
popd
-make clean
%endif
#######################################################################
# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if ivi ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
-%configure --prefix=$PREFIX --with-jpeg-turbo \
- --enable-shaderbincache=DISABLE --enable-profile=IVI \
- --enable-tizen-major-version=%{tizen_version_major} \
- --enable-feedback \
- --enable-efl=no \
-%if 0%{?enable_debug}
- --enable-debug \
-%endif
-%if 0%{?enable_trace}
- --enable-trace \
-%endif
- --enable-appfw=yes \
- $configure_flags --libdir=%{_libdir} \
- --enable-rename-so=no
-
-# Build.
-make %{?jobs:-j%jobs}
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
+mkdir ivi
+pushd ivi
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-adaptor*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done
-for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
+cmake -DENABLE_PROFILE=IVI $cmake_flags ..
-mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
+# Build.
+make %{?jobs:-j%jobs}
popd
-make clean
%endif
#######################################################################
# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if common ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
-%configure --prefix=$PREFIX --with-jpeg-turbo \
- --enable-shaderbincache=DISABLE --enable-profile=COMMON \
- --enable-tizen-major-version=%{tizen_version_major} \
- --enable-feedback \
- --enable-efl=no \
-%if 0%{?enable_debug}
- --enable-debug \
-%endif
-%if 0%{?enable_trace}
- --enable-trace \
-%endif
- --enable-appfw=yes \
- $configure_flags --libdir=%{_libdir} \
- --enable-rename-so=no
-# Build.
-make %{?jobs:-j%jobs}
+mkdir common
+pushd common
-pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-popd
+cmake -DENABLE_PROFILE=COMMON $cmake_flags ..
-pushd %{buildroot}%{_libdir}
-for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-for FILE in libdali-*plugin*-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done
-
-mv pkgconfig/dali-adaptor*pc %{_builddir}/%{name}-%{version}/build/tizen/
+# Build.
+make %{?jobs:-j%jobs}
popd
-make clean
-
%endif
##############################
rm -rf %{buildroot}
pushd %{_builddir}/%{name}-%{version}/build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# !unified && (wearable || tv || ivi || mobile)
-%if "%{?profile}" == "wearable" || "%{?profile}" == "tv" || "%{?profile}" == "ivi" || "%{?profile}" == "mobile"
-rm -rf %{buildroot}%{_libdir}/libdali-adap*.so*
+# if mobile || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+pushd mobile
+%make_install
+%if "%{?profile}" != "mobile"
+pushd %{buildroot}%{_libdir}
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.mobile # If we're only building this profile, then there's no need to copy the lib
+popd
+make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
+%endif
+popd
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# wearable || tv || ivi || mobile || unified
-%if "%{?profile}" != "common"
-for FILE in libdali-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
-mv dali-adaptor*.pc %{buildroot}%{_libdir}/pkgconfig/
+# if tv ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+pushd tv
+%make_install
+%if "%{?profile}" != "tv"
+pushd %{buildroot}%{_libdir}
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.tv # If we're only building this profile, then there's no need to copy the lib
+popd
+make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
%endif
popd
+%endif
-################################################
-#rename
-###############################################
-pushd %{buildroot}%{_libdir}
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if common ||"undefined"
-#%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
-rm -rf libdali-adaptor*.so
-ln -s libdali-adaptor-cxx11.so.0.0.0 libdali-adaptor.so
-#%endif
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if wearable || "undefined"
%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-rm -rf libdali-adaptor*.so.wearable
-ln -s libdali-adaptor-cxx11.so.0.0.*.wearable libdali-adaptor.so.wearable
+pushd wearable
+%make_install
+%if "%{?profile}" != "wearable"
+pushd %{buildroot}%{_libdir}
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.wearable # If we're only building this profile, then there's no need to copy the lib
+popd
+make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
%endif
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if tv ||"undefined"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
-rm -rf libdali-adaptor*.so.tv
-ln -s libdali-adaptor-cxx11.so.0.0.*.tv libdali-adaptor.so.tv
+popd
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if ivi ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
-rm -rf libdali-adaptor*.so.ivi
-ln -s libdali-adaptor-cxx11.so.0.0.*.ivi libdali-adaptor.so.ivi
+pushd ivi
+%make_install
+%if "%{?profile}" != "ivi"
+pushd %{buildroot}%{_libdir}
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.ivi # If we're only building this profile, then there's no need to copy the lib
+popd
+make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
+%endif
+popd
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if mobile || "undefined"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-rm -rf libdali-adaptor*.so.mobile
-ln -s libdali-adaptor-cxx11.so.0.0.*.mobile libdali-adaptor.so.mobile
+# if common ||"undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+pushd common
+%make_install
+# No clean so we can gather symbol/size information for the common profile
+popd
%endif
+
+# Create a symbolic link in integration-api to preserve legacy repo build
+pushd %{buildroot}%{_includedir}/dali/integration-api
+ln -sf adaptor-framework adaptors
popd
##############################
# 6 - Post uninstall old package
##############################
+##############################
+# Adaptor package Commands
%pre
exit 0
-##############################
-# Post Install new package
-##############################
%post
+pushd %{_libdir}
+for i in mobile tv wearable ivi; do [[ -f libdali2-adaptor.so.$i ]] && ln -sf libdali2-adaptor.so.$i libdali2-adaptor.so.2.0.0; done
+popd
/sbin/ldconfig
exit 0
-##############################
-# Pre Uninstall old package
-##############################
%preun
exit 0
-##############################
-# Post Uninstall old package
-##############################
%postun
/sbin/ldconfig
exit 0
##############################
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# Mobile Profile Commands
# if mobile || "undefined"
+# No need to create a symbolic link on install required if only building this profile
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
%post profile_mobile
+%if "%{?profile}" != "mobile"
pushd %{_libdir}
-for FILE in libdali-adaptor-cxx11.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done
+ln -sf libdali2-adaptor.so.mobile libdali2-adaptor.so.2.0.0
popd
+%endif
/sbin/ldconfig
exit 0
%endif
##############################
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if tv ||"undefined"
+# TV Profile Commands
+# No need to create a symbolic link on install required if only building this profile
%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
%post profile_tv
+%if "%{?profile}" != "tv"
pushd %{_libdir}
-for FILE in libdali-adaptor-cxx11.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
+ln -sf libdali2-adaptor.so.tv libdali2-adaptor.so.2.0.0
popd
+%endif
/sbin/ldconfig
exit 0
%endif
##############################
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if wearable || "undefined"
+# Wearable Profile Commands
+# No need to create a symbolic link on install required if only building this profile
%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
%post profile_wearable
+%if "%{?profile}" != "wearable"
pushd %{_libdir}
-for FILE in libdali-adaptor-cxx11.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done
+ln -sf libdali2-adaptor.so.wearable libdali2-adaptor.so.2.0.0
popd
+%endif
/sbin/ldconfig
exit 0
%endif
##############################
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if ivi ||"undefined"
+# IVI Profile Commands
+# No need to create a symbolic link on install required if only building this profile
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
%post profile_ivi
+%if "%{?profile}" != "ivi"
pushd %{_libdir}
-for FILE in libdali-adaptor-cxx11.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done
+ln -sf libdali2-adaptor.so.ivi libdali2-adaptor.so.0.0.0
popd
+%endif
/sbin/ldconfig
exit 0
%endif
##############################
+# Common Profile Commands
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
+%post profile_common
+/sbin/ldconfig
+exit 0
+
+%postun profile_common
+/sbin/ldconfig
+exit 0
+%endif
+
+##############################
# Files in Binary Packages
##############################
%dir %{user_shader_cache_dir}
%{_bindir}/*
%license LICENSE
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if common ||"undefined"
-#%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
%defattr(-,root,root,-)
-%{_libdir}/libdali-adaptor-cxx11.so.0*
-%{_libdir}/libdali-adaptor.so
-%exclude %{_libdir}/libdali-adap*.so*.mobile
-%exclude %{_libdir}/libdali-adap*.so*.wearable
-%exclude %{_libdir}/libdali-adap*.so*.tv
-%exclude %{_libdir}/libdali-adap*.so*.ivi
-#%endif
+%{_libdir}/libdali2-adaptor.so
+%{_libdir}/libdali2-adaptor.so.2
+%{_libdir}/libdali2-adaptor.so.2.0.0
#################################################
-%files dali-feedback-plugin
+%files dali2-feedback-plugin
%manifest dali-adaptor.manifest
%defattr(-,root,root,-)
-%{_libdir}/libdali-feedback-plugin-cxx11.so*
+%{_libdir}/libdali2-feedback-plugin.so*
%{dali_plugin_sound_files}/*
#################################################
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if common ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
%files profile_common
+%manifest dali-adaptor.manifest
# default .so files are housed in the main pkg.
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if mobile || "undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
%files profile_mobile
%manifest dali-adaptor.manifest
%defattr(-,root,root,-)
-%{_libdir}/libdali-adaptor.so.mobile
-%{_libdir}/libdali-adaptor-cxx11.so.0*.mobile
+%if "%{?profile}" != "mobile"
+%{_libdir}/libdali2-adaptor.so.mobile
+%endif
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if tv ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile"
%files profile_tv
%manifest dali-adaptor.manifest
%defattr(-,root,root,-)
-%{_libdir}/libdali-adaptor.so.tv
-%{_libdir}/libdali-adaptor-cxx11.so.0*.tv
+%if "%{?profile}" != "tv"
+%{_libdir}/libdali2-adaptor.so.tv
+%endif
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if wearable || "undefined"
%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
%files profile_wearable
%manifest dali-adaptor.manifest
%defattr(-,root,root,-)
-%{_libdir}/libdali-adaptor.so.wearable
-%{_libdir}/libdali-adaptor-cxx11.so.0*.wearable
+%if "%{?profile}" != "wearable"
+%{_libdir}/libdali2-adaptor.so.wearable
+%endif
%endif
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
# if ivi ||"undefined"
%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile"
%files profile_ivi
%manifest dali-adaptor.manifest
%defattr(-,root,root,-)
-%{_libdir}/libdali-adaptor.so.ivi
-%{_libdir}/libdali-adaptor-cxx11.so.0*.ivi
+%if "%{?profile}" != "ivi"
+%{_libdir}/libdali2-adaptor.so.ivi
+%endif
%endif
-
%files devel
%defattr(-,root,root,-)
-%{dev_include_path}/dali/dali.h
-%{dev_include_path}/dali/public-api/*
-%{dev_include_path}/dali/devel-api/*
-%{dev_include_path}/dali/doc/*
-%{_libdir}/pkgconfig/dali-adaptor.pc
+%{_includedir}/dali/dali.h
+%{_includedir}/dali/public-api/*
+%{_includedir}/dali/devel-api/*
+%{_includedir}/dali/doc/*
+%{_libdir}/pkgconfig/dali2-adaptor.pc
%files integration-devel
%defattr(-,root,root,-)
-%{dev_include_path}/dali/integration-api/adaptors/*
-%{_libdir}/pkgconfig/dali-adaptor-integration.pc
-
+%{_includedir}/dali/integration-api/adaptor-framework/*
+%{_includedir}/dali/integration-api/adaptors
+%{_libdir}/pkgconfig/dali2-adaptor-integration.pc