diff options
author | MyungJoo Ham <myungjoo.ham@samsung.com> | 2016-11-10 20:16:15 +0900 |
---|---|---|
committer | MyungJoo Ham <myungjoo.ham@samsung.com> | 2016-11-10 20:17:03 +0900 |
commit | b60891aca718cc71d27fc826725d4fc76bdcd6f4 (patch) | |
tree | 843a2622dac0f0b31ad6325d7887d5d5ccd9d7c7 | |
parent | a6367952f14599eefad7d4a0080905f04e0b5b55 (diff) | |
download | browser-b60891aca718cc71d27fc826725d4fc76bdcd6f4.tar.gz browser-b60891aca718cc71d27fc826725d4fc76bdcd6f4.tar.bz2 browser-b60891aca718cc71d27fc826725d4fc76bdcd6f4.zip |
Configuarbility/BuildingBlock Support for Tizen 4.0
- This is for Tizen 4.0. Do not merge into 3.0 (tizen_3.0) branch.
- When this commit gets SR'ed, the maintainer needs to create JIRA-TRE
issue of:
- Replace browser with browser-profile_mobile in mobile profile.
- For Tizen 4.0 Configurability / Building Blocks, every Tizen package
should be able to be built in a single OBS project (Unified Build)
and every Tizen pacakge should be able to be located in a single
dependency tree.
- For Type-B packages (packages with same name but differnt profile
located in different git paths), we add Provides for common package
name to make this change transparent to other packages and make
each package unique.
- Other twins--tv--will be modified soon as well.
- For common: https://review.tizen.org/gerrit/#/c/96850/
Change-Id: I6fd2affc9e1cc5a05eefb22a5e8b0cd3a5f47abd
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-rwxr-xr-x | packaging/org.tizen.browser.spec | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/packaging/org.tizen.browser.spec b/packaging/org.tizen.browser.spec index 8dc8b75..28e0c46 100755 --- a/packaging/org.tizen.browser.spec +++ b/packaging/org.tizen.browser.spec @@ -1,7 +1,12 @@ -Name: org.tizen.browser +%define alias org.tizen.browser + +Name: org.tizen.browser-profile_mobile Summary: Tizen TV Open Browser Version: 2.0.0 Release: 0 +Provides: org.tizen.browser = %{version}-%{release} +Conflicts: org.tizen.browser-profile_common +Conflicts: org.tizen.browser-profile_tv License: Apache-2.0 Group: Applications/Web Source0: %{name}-%{version}.tar.gz @@ -31,11 +36,9 @@ BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(capi-media-image-util) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libtzplatform-config) -%if "%{?profile}" == "mobile" BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(capi-system-system-settings) BuildRequires: pkgconfig(libsoup-2.4) -%endif BuildRequires: browser-provider-devel BuildRequires: pkgconfig(efl-extension) @@ -48,13 +51,11 @@ BuildRequires: boost-thread BuildRequires: boost-filesystem BuildRequires: boost-system -%if "%{?profile}" == "mobile" BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(appsvc) BuildRequires: pkgconfig(capi-appfw-app-manager) BuildRequires: pkgconfig(capi-content-media-content) BuildRequires: pkgconfig(shortcut) -%endif %define BUILD_UT %{?build_ut:ON}%{!?build_ut:OFF} %if %BUILD_UT == "ON" @@ -67,7 +68,7 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(libtzplatform-config) -%define _appdir %{TZ_SYS_RO_APP}/%{name} +%define _appdir %{TZ_SYS_RO_APP}/%{alias} %define _bindir %{_appdir}/bin %define COVERAGE_STATS %{?coverage_stats:ON}%{!?coverage_stats:OFF} @@ -92,14 +93,14 @@ export FFLAGS="$(echo $FFLAGS | sed 's/-Wl,--as-needed//g')" cmake .. \ -DCMAKE_BUILD_TYPE=%{?build_type}%{!?build_type:RELEASE} \ -DCMAKE_INSTALL_PREFIX=%{_appdir} \ - -DPACKAGE_NAME=%{name} \ + -DPACKAGE_NAME=%{alias} \ -DBINDIR=%{_bindir} \ -DVERSION=%{version} \ -DMANIFESTDIR=%{_manifestdir} \ -DICONDIR=%{_icondir} \ -DBUILD_UT=%{BUILD_UT} \ -DCOVERAGE_STATS=%{COVERAGE_STATS} \ - -DPROFILE=%{profile} \ + -DPROFILE=mobile \ -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \ -DTZ_SYS_RO_ICONS=%{TZ_SYS_RO_ICONS} \ %if "%{?_with_wayland}" == "1" @@ -119,7 +120,7 @@ cd %{_build_dir} %files %manifest org.tizen.browser.manifest %{_icondir}/org.tizen.browser.png -%{_manifestdir}/%{name}.xml +%{_manifestdir}/%{alias}.xml %defattr(-,root,root,-) %{_appdir}/bin/browser %{_appdir}/res/edje/*/*.edj |