summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2016-11-10 20:07:42 +0900
committerHyeKyoung Hwang <cookie@samsung.com>2016-12-21 14:34:44 +0900
commit6e6b19477e2b52b70a46a8266dd1d56394c4a123 (patch)
tree9ce104e6feb4c0c54e52e24770e5d6729bc8a368
parent2bbd6cceb0b70faaa03c71c5a82623c40fce2c27 (diff)
downloadbrowser-6e6b19477e2b52b70a46a8266dd1d56394c4a123.tar.gz
browser-6e6b19477e2b52b70a46a8266dd1d56394c4a123.tar.bz2
browser-6e6b19477e2b52b70a46a8266dd1d56394c4a123.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_common in common 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--mobile and tv--will be modified soon as well. Change-Id: Iac71a69ec44afd9d724abe19d912f78894b1bd97 Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-rwxr-xr-xpackaging/org.tizen.browser.spec26
1 files changed, 10 insertions, 16 deletions
diff --git a/packaging/org.tizen.browser.spec b/packaging/org.tizen.browser.spec
index 8b129649..7c349d6f 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_common
Summary: Tizen TV Open Browser
Version: 1.6.4
Release: 0
+Provides: org.tizen.browser = %{version}-%{release}
+Conflicts: org.tizen.browser-profile_mobile
+Conflicts: org.tizen.browser-profile_tv
License: Apache-2.0
Group: Applications/Web
Source0: %{name}-%{version}.tar.gz
@@ -31,10 +36,6 @@ 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)
-%endif
BuildRequires: browser-provider-devel
BuildRequires: pkgconfig(efl-extension)
@@ -47,13 +48,6 @@ 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)
-%endif
-
%define BUILD_UT %{?build_ut:ON}%{!?build_ut:OFF}
%if %BUILD_UT == "ON"
BuildRequires: boost-test
@@ -65,7 +59,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}
@@ -90,14 +84,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=common \
-DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
-DTZ_SYS_RO_ICONS=%{TZ_SYS_RO_ICONS} \
%if "%{?_with_wayland}" == "1"
@@ -117,7 +111,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