Changes - SailfishOS Open Build Service

Changes of Revision 2

[-] [+]	Changed	_service:tar_git:droid-hal-version-oneplus3.spec
@@ -22,9 +22,9 @@ %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}') @@ -37,9 +37,9 @@ %endif Name: droid-hal-version-%{rpm_device} -Version: 0.0.1+master.20180216071458.21a8336 +Version: 0.0.1+master.20181006160407.8fada64 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 @@ -100,15 +100,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 @@ -124,13 +123,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 @@ -139,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/" @@ -149,10 +142,9 @@ 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"
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/delaya73/droid-hal-version-oneplus3.git</param> <param name="branch">master</param> - <param name="revision">21a83368472d51ede80b5b5806e5ca1c6a6302ba</param> + <param name="revision">8fada646a094cb19c5be317221940602019dd0f7</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Deleted	_service:tar_git:droid-hal-version-oneplus3-0.0.1+master.20180216071458.21a8336.tar.gz ^
	Added	_service:tar_git:droid-hal-version-oneplus3-0.0.1+master.20181006160407.8fada64.tar.gz ^