Changes - SailfishOS Open Build Service

Changes of Revision 12

[-] [+]	Changed	_service:tar_git:droid-hal-version-mido.spec
@@ -19,9 +19,9 @@ %define _obs_commit_count %(echo %{release} \| awk -F . '{if (NF >= 2) print $2; else print $1 }') %if "%{_build_flavour}" == "release" -%define _version_appendix (%{_target_cpu}) +%define _version_appendix %{nil} %else -%define _version_appendix (%{_target_cpu},%{_build_flavour}) +%define _version_appendix \ (%{_build_flavour}) %endif %define _shortened_version %(echo %{version} \| awk -F '+' '{print $1}') @@ -34,11 +34,16 @@ %endif Name: droid-hal-version-%{rpm_device} -Version: 0.0.4 +Version: 0.1.0+master.20201125204852.1.g84f710a +%if 0%{?_obs_build_project:1} Release: 1 -Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) +%else +%define rel_date %(date +'%%Y%%m%%d%%H%%M') +Release: %{rel_date} +%endif +Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_build_flavour}) Group: System/Libraries -License: BSD-3-Clause +License: BSD Source: %{name}-%{version}.tar.gz # Generic dependencies @@ -59,8 +64,10 @@ # Kernel & Boot BuildRequires: droid-hal-kernel +%if 0%{?_obs_build_project:1} BuildRequires: droid-hal-img-boot BuildRequires: droid-hal-img-recovery +%endif BuildRequires: droid-config-preinit-plugins # Kernel modules @@ -97,14 +104,14 @@ BuildRequires: qtscenegraph-adaptation %description -SailfishOS HW Adaptation %{rpm_device} version/umbrella package (%{version}.%{_obs_build_count}) for %{_target_cpu} platform. +SailfishOS HW Adaptation %{rpm_device} version/umbrella package (%{version}.%{_obs_build_count}). %files %defattr(-,root,root,-) %config %{_sysconfdir}/hw-release %package doc -Summary: SailfishOS %{version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) +Summary: SailfishOS %{version}.%{_obs_build_count} (%{_build_flavour}) Group: System/Libraries %description doc @@ -129,9 +136,9 @@ ID=%{rpm_device} MER_HA_DEVICE=%{rpm_device} MER_HA_VENDOR=%{rpm_vendor} -VERSION="%{version}.%{_obs_build_count} %{_version_appendix}" +VERSION="%{version}.%{_obs_build_count}%{_version_appendix}" VERSION_ID=%{version}.%{_obs_build_count} -PRETTY_NAME="$DEVICE %{version}.%{_obs_build_count} %{_version_appendix}" +PRETTY_NAME="$DEVICE %{version}.%{_obs_build_count}%{_version_appendix}" SAILFISH_BUILD=%{_obs_build_count} SAILFISH_FLAVOUR=%{_build_flavour} HOME_URL="https://sailfishos.org/"
[-] [+]	Changed	_service ^
@@ -10,4 +10,4 @@ <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> -</service></services> +</service></services> \ No newline at end of file
	Deleted	_service:tar_git:droid-hal-version-mido-0.0.4.tar.gz ^
	Added	_service:tar_git:droid-hal-version-mido-0.1.0+master.20201125204852.1.g84f710a.tar.gz ^