diff options
author | MyungJoo Ham <myungjoo.ham@samsung.com> | 2016-11-30 21:00:08 +0900 |
---|---|---|
committer | MyungJoo Ham <myungjoo.ham@samsung.com> | 2017-01-25 21:56:57 -0800 |
commit | 7671bf6b13869a11ced59f587460752fd4eabe6b (patch) | |
tree | a7e2925bc7375ffc71c26d283f32391a20975df1 /packaging | |
parent | 24899e2264dd187e7e452e0ffad9d2df1d490927 (diff) | |
download | connman-7671bf6b13869a11ced59f587460752fd4eabe6b.tar.gz connman-7671bf6b13869a11ced59f587460752fd4eabe6b.tar.bz2 connman-7671bf6b13869a11ced59f587460752fd4eabe6b.zip |
Remove Profile Build Dependency (2/2): tv/ivi extensionsubmit/tizen/20170207.045631accepted/tizen/wearable/20170207.092042accepted/tizen/tv/20170207.092028accepted/tizen/mobile/20170207.092014accepted/tizen/ivi/20170207.092054accepted/tizen/common/20170207.062009
- This is for Tizen 4.0.
: Tizen 4.0 Configurability and Build Blocks require
to remove all profile-depending build options in spec files.
(No More profile macros)
- Maintainers need to create JIRA-TRE issue when SR-ing this:
- Add connman-profile_tv for tv profile
- Add connman-profile_ivi for ivi profile
Change-Id: Ic2c6022b389444fd26c7f9ee20290f50b38b5434
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/connman.spec | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index 81854388..b2e1d6a2 100755 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -33,6 +33,9 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires: net-config +Provides: %{name}-profile_common = %{version}-%{release} +Provides: %{name}-profile_mobile = %{version}-%{release} +Provides: %{name}-profile_wearable = %{version}-%{release} %define upgrade_script_filename 500.connman_upgrade.sh %define upgrade_script_path /usr/share/upgrade/scripts @@ -90,6 +93,24 @@ Requires: %{name} = %{version} %description devel Header files and development files for connman. +%package extension-tv +Summary: Connman service script for TV profile +Requires: %{name} = %{version}-%{release} +Provides: %{name}-profile_tv = %{version}-%{release} +Conflicts: %{name}-extension-ivi +%description extension-tv +Supplies Tizen TV profile systemd service scripts instead of the default one. +This overwrites service script of %{name}. + +%package extension-ivi +Summary: Connman configuration for IVI profile +Requires: %{name} = %{version}-%{release} +Provides: %{name}-profile_ivi = %{version}-%{release} +Conflicts: %{name}-extension-tv +%description extension-ivi +Supplies Tizen IVI profile configuration instead of the default one. +This overwrites conf file of %{name}. + %prep %setup -q @@ -138,17 +159,12 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/ mkdir -p %{buildroot}%{_unitdir} %endif -%if "%{profile}" == "tv" -cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service -%if "%{?_lib}" == "lib64" -cp src/connman_tv.service %{buildroot}%{_unitdir}/connman.service -cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service -%endif -%else %if "%{?_lib}" == "lib64" +cp src/connman_tv.service %{buildroot}%{_unitdir}/connman.service.tv cp src/connman.service %{buildroot}%{_unitdir}/connman.service cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service -%endif +%else +cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service.tv %endif mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants @@ -175,11 +191,9 @@ mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services cp resources/usr/share/dbus-1/system-services/net.connman.service %{buildroot}%{_datadir}/dbus-1/system-services/net.connman.service mkdir -p %{buildroot}/etc/connman -%if "%{profile}" == "ivi" -cp src/main_ivi.conf %{buildroot}/etc/connman/main.conf -%else +cp src/main_ivi.conf %{buildroot}/etc/connman/main.conf.ivi +cp src/main_tv.conf %{buildroot}/etc/connman/main.conf.tv cp src/main.conf %{buildroot}/etc/connman/main.conf -%endif rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/ @@ -271,4 +285,17 @@ systemctl daemon-reload %{_datadir}/dbus-1/system-services/net.connman.vpn.service %endif - +%post extension-tv +mv -f %{_libdir}/systemd/system/connman.service.tv %{_libdir}/systemd/system/connman.service +mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf +%files extension-tv +%attr(644,root,root) %{_sysconfdir}/connman/main.conf.tv +%if "%{?_lib}" == "lib64" +%attr(644,root,root) %{_unitdir}/connman.service.tv +%else +%attr(644,root,root) %{_libdir}/systemd/system/connman.service.tv +%endif +%post extension-ivi +mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf +%files extension-ivi +%attr(644,root,root) %{_sysconfdir}/connman/main.conf.ivi |