|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-h8416.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,8 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-sony-tama/droid-hal-version-sony-tama.git</param>
<param name="branch">master</param>
+ <param name="revision">0.4.0</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
-<!-- Bump Config: 2021-12-01 21:46:35 --></services>
\ No newline at end of file
+<!-- Bump Config: 2021-12-01 21:46:35 --></services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-h8416-0.4.0.tar.gz/droid-hal-version/droid-hal-version.inc
^
|
| @@ -1,5 +1,5 @@
%if 0%{?_obs_build_project:1}
-%define _build_flavour %{?qa_stage_name}%{!?qa_stage_name:unknown}
+%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)
%else
%define _build_flavour unknown
%endif
@@ -23,10 +23,6 @@
%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
%if 0%{?_obs_build_project:1}
@@ -81,6 +77,7 @@
# 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
@@ -89,6 +86,10 @@
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}
@@ -136,10 +137,10 @@
MER_HA_VENDOR=%{rpm_vendor}
VERSION="%{version}.%{_obs_build_count}%{_version_appendix}"
VERSION_ID=%{version}.%{_obs_build_count}
-PRETTY_NAME="%{device_pretty} %{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=%{home_url}
+HOME_URL="https://sailfishos.org/"
EOF
cat %{buildroot}/%{_sysconfdir}/hw-release
|
