[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-fp2-sibon.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-fp2-sibon.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/mlehtima/droid-hal-version-fp2-sibon.git</param>
<param name="branch">master</param>
- <param name="revision">02ef6a5e68361a106587ba8da6fd8633490de03b</param>
+ <param name="revision">454e00ef2c7a7f550d6302d36977a95794040b48</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-fp2-sibon-0.0.8.tar.gz/droid-hal-version/droid-hal-version.inc
^
|
@@ -1,5 +1,5 @@
%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
@@ -23,6 +23,10 @@
%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}
@@ -77,7 +81,6 @@
# 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
@@ -86,10 +89,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}
@@ -137,10 +136,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
|