|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-cancro.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/CancroSailors/droid-hal-version-cancro.git</param>
<param name="branch">master</param>
- <param name="revision">f25b299684cbe9b6737d117f7cd98b4f14253a10</param>
+ <param name="revision">82e39bad438adf73e0f79be92787adf93160b823</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-cancro-0.0.3.tar.gz/droid-hal-version/droid-hal-version-@DEVICE@.spec.template
^
|
| @@ -8,8 +8,8 @@
%define device_pretty @DEVICE_PRETTY@
# See ../droid-hal-version/droid-hal-device.inc for similar macros:
-%define have_vibrator 1
-%define have_led 1
+%define have_vibrator_native 1
+%define have_led 1
%include droid-hal-version/droid-hal-version.inc
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-cancro-0.0.3.tar.gz/droid-hal-version/droid-hal-version.inc
^
|
| @@ -62,14 +62,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
@@ -86,7 +92,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})
@@ -105,13 +110,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,6 +129,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
-
|
