Changes - SailfishOS Open Build Service

Changes of Revision 16

[-] [+]	Changed	_service:tar_git:droid-hal-version-pinephone.spec
@@ -10,7 +10,7 @@ %define have_led 1 %define native_build 1 %if 0%{?_obs_build_project:1} -%define _build_flavour %(echo %{_obs_build_project} \| awk -F : '{if ($NF == "testing" \|\| $NF == "release") print $NF; else if ($NF ~ /[0-9]\.[0-9]\.[0-9]/ && NF == 3) print strdevel; else if (NF == 2) print strdevel; else print strunknown}' strdevel=devel strunknown=unknown) +%define _build_flavour %{?qa_stage_name}%{!?qa_stage_name:unknown} %else %define _build_flavour unknown %endif @@ -34,16 +34,28 @@ %define rpm_vendor %{vendor} %endif +%if 0%{!?home_url:1} +%define home_url "https://sailfishos.org/" +%endif + Name: droid-hal-version-%{rpm_device} -Version: 0.0.1+master.20210720204255.6962750 +Version: 0.0.1+master.20230612193014.f2393ed +%if 0%{?_obs_build_project:1} Release: 1 +%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 +# For devices that were last reflashed before switching from patterns to +# meta-packages, otherwise they will miss any patterns changes in the future: +Requires: patterns-sailfish-device-configuration-%{rpm_device} # Generic dependencies -#BuildRequires: droid-hal +BuildRequires: droid-hal BuildRequires: droid-config BuildRequires: droid-config-sailfish %if 0%{!?native_build:1} @@ -61,10 +73,12 @@ %endif # Kernel & Boot -#BuildRequires: droid-hal-kernel -#BuildRequires: droid-hal-img-boot -#BuildRequires: droid-hal-img-recovery -#BuildRequires: droid-config-preinit-plugins +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 %if 0%{?have_kernel_modules:1} @@ -74,15 +88,12 @@ # Audio %if 0%{!?native_build:1} BuildRequires: pulseaudio-modules-droid -%else -BuildRequires: pulseaudio-module-keepalive %endif BuildRequires: droid-config-pulseaudio-settings # Haptics native %if 0%{?have_vibrator_native:1} && 0%{!?have_vibrator:1} && 0%{!?have_ffmemless:1} BuildRequires: ngfd-plugin-native-vibrator -BuildRequires: qt5-feedback-haptics-native-vibrator %endif # Haptics @@ -91,10 +102,6 @@ BuildRequires: qt5-feedback-haptics-droid-vibrator %endif -# Haptics with ffmemless -%if 0%{!?have_vibrator_native:1} && 0%{!?have_vibrator:1} && 0%{?have_ffmemless:1} -BuildRequires: qt5-feedback-haptics-ffmemless -%endif # Sensors %if 0%{!?native_build:1} @@ -142,10 +149,10 @@ MER_HA_VENDOR=%{rpm_vendor} 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_pretty} %{version}.%{_obs_build_count}%{_version_appendix}" SAILFISH_BUILD=%{_obs_build_count} SAILFISH_FLAVOUR=%{_build_flavour} -HOME_URL="https://sailfishos.org/" +HOME_URL=%{home_url} EOF cat %{buildroot}/%{_sysconfdir}/hw-release
	Deleted	_service:tar_git:droid-hal-version-pinephone-0.0.1+master.20210720204255.6962750.tar.gz ^
	Added	_service:tar_git:droid-hal-version-pinephone-0.0.1+master.20230612193014.f2393ed.tar.gz ^