Changes - SailfishOS Open Build Service

Changes of Revision 9

[-] [+]	Changed	_service:tar_git:droid-hal-version-titan.spec
@@ -8,7 +8,7 @@ %define vendor_pretty Motorola %define device_pretty Moto G (2nd Gen.) #See ../droid-hal-version/droid-hal-device.inc for similar macros: -%define have_vibrator 1 +%define have_vibrator_native 1 %define have_led 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) @@ -21,17 +21,24 @@ %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}') +%if 0%{!?rpm_device:1} +%define rpm_device %{device} +%endif +%if 0%{!?rpm_vendor:1} +%define rpm_vendor %{vendor} +%endif + Name: droid-hal-version-%{rpm_device} -Version: 0.0.1+master.20150918162944.974305d +Version: 0.0.1+master.20190330083618.883ffeb Release: 1 -Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) +Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_build_flavour}) Group: System/Libraries License: BSD-3-Clause Source: %{name}-%{version}.tar.gz @@ -67,22 +74,23 @@ BuildRequires: pulseaudio-modules-droid BuildRequires: droid-config-pulseaudio-settings -# Camera -%if 0%{?have_camera:1} -BuildRequires: gstreamer0.10-droidcamsrc -%endif - -# Multimedia -%if 0%{?have_mm_omx:1} -BuildRequires: gstreamer0.10-omx +# 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 -%if 0%{?have_vibrator:1} +%if 0%{?!have_vibrator_native:1} && 0%{?have_vibrator:1} && 0%{?!have_ffmemless:1} BuildRequires: ngfd-plugin-droid-vibrator 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 BuildRequires: hybris-libsensorfw-qt5 @@ -91,15 +99,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 -%{_datadir}/sailfish-version/packagelist.d/* %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 @@ -115,13 +122,7 @@ %install echo "Building for %{_build_flavour}" -mkdir -p %{buildroot}/%{_datadir}/sailfish-version/packagelist.d -RPM_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-droid-hal-version-%{rpm_device}}.spec -for req in `rpmspec -q --buildrequires $RPM_PATH`; do - rpm -qa $req >> %{buildroot}/%{_datadir}/sailfish-version/packagelist.d/%{name} -done mkdir -p %{buildroot}/%{_sysconfdir} - echo Creating hw-release # based on http://www.freedesktop.org/software/systemd/man/os-release.html cat > %{buildroot}/%{_sysconfdir}/hw-release <<EOF @@ -130,9 +131,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/" @@ -140,6 +141,5 @@ cat %{buildroot}/%{_sysconfdir}/hw-release mkdir -p %{buildroot}/%{_datadir}/doc/SailfishOS -cp %{buildroot}/%{_datadir}/sailfish-version/packagelist.d/* %{buildroot}/%{_sysconfdir}/hw-release %{buildroot}/%{_datadir}/doc/SailfishOS/ +cp %{buildroot}/%{_sysconfdir}/hw-release %{buildroot}/%{_datadir}/doc/SailfishOS/ rpm -qa \| sort > %{buildroot}/%{_datadir}/doc/SailfishOS/extended-packagelist-droid -
	Deleted	_service:tar_git:droid-hal-version-titan-0.0.1+master.20150918162944.974305d.tar.gz ^
	Added	_service:tar_git:droid-hal-version-titan-0.0.1+master.20190330083618.883ffeb.tar.gz ^