Changes - SailfishOS Open Build Service

Changes of Revision 9

[-] [+]	Changed	_service:tar_git:droid-hal-version-bacon.spec
@@ -5,11 +5,13 @@ # Manufacturer and device name to be shown in UI %define vendor_pretty OnePlus %define device_pretty One + # See ../droid-hal-version/droid-hal-device.inc for similar macros: -# This is the only way to disable an RPM macro # define have_vibrator 1 -%define have_ffmemless 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 @@ -36,7 +38,7 @@ %endif Name: droid-hal-version-%{rpm_device} -Version: 0.0.1+master.20170314175050.e505c84 +Version: 0.0.1+master.20180916104818.9be602a Release: 1 Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) Group: System/Libraries @@ -74,14 +76,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 @@ -98,7 +106,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}) @@ -117,13 +124,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 @@ -142,6 +143,10 @@ 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 +# IMPORTANT if you want to comment out any macros in your .spec, delete the % +# sign, otherwise they will remain defined! E.g.: +#define some_macro "I'll not be defined because I don't have % in front" +
	Deleted	_service:tar_git:droid-hal-version-bacon-0.0.1+master.20170314175050.e505c84.tar.gz ^
	Added	_service:tar_git:droid-hal-version-bacon-0.0.1+master.20180916104818.9be602a.tar.gz ^