Changes - SailfishOS Open Build Service

Changes of Revision 8

[-] [+]	Changed	_service:tar_git:droid-hal-version-surnia.spec
@@ -2,12 +2,10 @@ %define rpm_vendor motorola #Manufacturer and device name to be shown in UI %define vendor_pretty Motorola -%define device_pretty Moto E2 +%define device_pretty Moto E2 LTE #See ../droid-hal-version/droid-hal-device.inc forsimilar macros: -%define have_vibrator 1 -#%define have_ffmemless 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) %else @@ -34,7 +32,7 @@ %endif Name: droid-hal-version-%{rpm_device} -Version: 0.0.1+hybris.12.1.20170816203734.a9a5f33 +Version: 0.0.1+hybris.14.1.20180723164939.fc32800 Release: 1 Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) Group: System/Libraries @@ -72,14 +70,20 @@ BuildRequires: pulseaudio-modules-droid 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 -%if 0%{?have_vibrator:1} && 0%{?!have_ffmemless: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_ffmemless:1} && 0%{?!have_vibrator:1} +%if 0%{?!have_vibrator_native:1} && 0%{?!have_vibrator:1} && 0%{?have_ffmemless:1} BuildRequires: qt5-feedback-haptics-ffmemless %endif @@ -96,7 +100,6 @@ %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}) @@ -115,13 +118,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 @@ -140,6 +137,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 -
[-] [+]	Changed	_service ^
@@ -1,7 +1,7 @@ <services> <service name="tar_git"> <param name="url">https://github.com/wiktorek140/droid-hal-version-surnia.git</param> - <param name="branch">hybris-12.1</param> + <param name="branch">hybris-14.1</param> <param name="revision">HEAD</param> <param name="token"/> <param name="debian">N</param>
	Deleted	_service:tar_git:droid-hal-version-surnia-0.0.1+hybris.12.1.20170816203734.a9a5f33.tar.gz ^
	Added	_service:tar_git:droid-hal-version-surnia-0.0.1+hybris.14.1.20180723164939.fc32800.tar.gz ^