Changes - SailfishOS Open Build Service

Changes of Revision 21

[-] [+]	Changed	_service:tar_git:droid-config-scorpion_windy.spec
@@ -87,15 +87,16 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 2.1.4.14+hybris.aosp6.20190330071928.8.g4211abf +Version: 2.1.4.14+hybris.aosp6.20191114074250.9.ga8f8f6c Release: 1 Group: Configs License: GPLv2 Source0: %{name}-%{version}.tar.bz2 -BuildRequires: ssu-kickstart-configuration-jolla +BuildRequires: ssu-kickstart-configuration BuildRequires: pkgconfig(android-headers) BuildRequires: repomd-pattern-builder BuildRequires: qt5-qttools-kmap2qmap +Requires: droid-hal %if 0%{?community_adaptation:1} # because it provides one ssu feature, do: Requires: community-adaptation @@ -170,7 +171,7 @@ %package kickstart-configuration Summary: Kickstart configuration for %{rpm_device} Provides: droid-config-kickstart-configuration -Requires: ssu-kickstart-configuration-jolla +Requires: ssu-kickstart-configuration Provides: droid-hal-kickstart-configuration # the %{name} contains ssu.ini file which is needed to build kickstarts Requires: %{name} = %{version}-%{release} @@ -513,15 +514,18 @@ cp -rf %{dcd_path}/kickstart/* $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/ fi -# if we are building on Mer OBS or locally, make a domain=sales .ks -# so it works for HADK users: -%define disturl_subst %(echo %{disturl} \| grep jollamobile.com) -%if "%{disturl_subst}" == "" - echo "Setting domain to sales" - %define ssu_override domain=sales -%else - echo "Setting domain to jolla" - %define ssu_override domain=jolla +# Do not set ssu_override if it is already defined +%if 0%{!?ssu_override:1} + # if we are building on Mer OBS or locally, make a domain=sales .ks + # so it works for HADK users: + %define disturl_subst %(echo %{disturl} \| grep jollamobile.com) + %if "%{disturl_subst}" == "" + echo "Setting domain to sales" + %define ssu_override domain=sales + %else + echo "Setting domain to jolla" + %define ssu_override domain=jolla + %endif %endif # build rnd kickstarts on devel level, release kickstarts on all other levels
	Deleted	_service:tar_git:droid-config-scorpion_windy-2.1.4.14+hybris.aosp6.20190330071928.8.g4211abf.tar.bz2 ^
	Added	_service:tar_git:droid-config-scorpion_windy-2.1.4.14+hybris.aosp6.20191114074250.9.ga8f8f6c.tar.bz2 ^