Changes - SailfishOS Open Build Service

Changes of Revision 6

[-] [+]	Changed	_service:tar_git:droid-hal-version-lux.spec
@@ -21,9 +21,9 @@ %define _obs_commit_count %(echo %{release} \| awk -F . '{if (NF >= 2) print $2; else print $1 }') %if "%{_build_flavour}" == "release" -%define _version_appendix %{nil} +%define _version_appendix (%{_target_cpu}) %else -%define _version_appendix \ (%{_build_flavour}) +%define _version_appendix (%{_target_cpu},%{_build_flavour}) %endif %define _shortened_version %(echo %{version} \| awk -F '+' '{print $1}') @@ -36,9 +36,9 @@ %endif Name: droid-hal-version-%{rpm_device} -Version: 0.0.1+cm.14.1.20190224110612.0f6ee30 +Version: 0.0.1+cm.14.1.20180610163108.0f58edf Release: 1 -Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_build_flavour}) +Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) Group: System/Libraries License: BSD-3-Clause Source: %{name}-%{version}.tar.gz @@ -74,20 +74,14 @@ 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_native:1} && 0%{?have_vibrator:1} && 0%{?!have_ffmemless:1} +%if 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} +%if 0%{?have_ffmemless:1} && 0%{?!have_vibrator:1} BuildRequires: qt5-feedback-haptics-ffmemless %endif @@ -99,14 +93,15 @@ BuildRequires: qtscenegraph-adaptation %description -SailfishOS HW Adaptation %{rpm_device} version/umbrella package (%{version}.%{_obs_build_count}). +SailfishOS HW Adaptation %{rpm_device} version/umbrella package (%{version}.%{_obs_build_count}) for %{_target_cpu} platform. %files %defattr(-,root,root,-) %config %{_sysconfdir}/hw-release +%{_datadir}/sailfish-version/packagelist.d/* %package doc -Summary: SailfishOS %{version}.%{_obs_build_count} (%{_build_flavour}) +Summary: SailfishOS %{version}.%{_obs_build_count} (%{_target_cpu},%{_build_flavour}) Group: System/Libraries %description doc @@ -122,7 +117,13 @@ %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 @@ -131,9 +132,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/" @@ -141,5 +142,6 @@ cat %{buildroot}/%{_sysconfdir}/hw-release mkdir -p %{buildroot}/%{_datadir}/doc/SailfishOS -cp %{buildroot}/%{_sysconfdir}/hw-release %{buildroot}/%{_datadir}/doc/SailfishOS/ +cp %{buildroot}/%{_datadir}/sailfish-version/packagelist.d/* %{buildroot}/%{_sysconfdir}/hw-release %{buildroot}/%{_datadir}/doc/SailfishOS/ rpm -qa \| sort > %{buildroot}/%{_datadir}/doc/SailfishOS/extended-packagelist-droid +
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://github.com/VerdandiTeam/droid-hal-version-lux.git</param> <param name="branch">cm-14.1</param> - <param name="revision"/> + <param name="revision">0f58edf964967a9cb6e381e3652c4da7da22fec7</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Added	_service:tar_git:droid-hal-version-lux-0.0.1+cm.14.1.20180610163108.0f58edf.tar.gz ^
	Deleted	_service:tar_git:droid-hal-version-lux-0.0.1+cm.14.1.20190224110612.0f6ee30.tar.gz ^