Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:community-adaptation-testing.spec
@@ -1,11 +1,12 @@ %define flavour testing Conflicts: community-adaptation-devel +Conflicts: community-adaptation-localbuild Summary: Community HW adaptation setup, %{flavour} flavour License: BSD-3-Clause Name: community-adaptation-%{flavour} -Version: 0.0.1 +Version: 0.0.1+master.20170216210445.1.gb08e401 Release: 1 Provides: community-adaptation Group: System @@ -20,22 +21,28 @@ %install -%if "%{flavour}" != "devel" +%if "%{flavour}" == "testing" touch $RPM_BUILD_ROOT/init_disable_telnet %endif mkdir -p $RPM_BUILD_ROOT/%{_datadir}/community-adaptation/ +%if "%{flavour}" != "localbuild" sed -e "s\|@FLAVOUR@\|%{flavour}\|g" \ -%if "%{flavour}" == "devel" +%if "%{flavour}" != "testing" -e "s\|sailfishos_%%(release)\|sailfish_latest_%%(arch)\|g" \ %endif adaptation-community.ini.in > $RPM_BUILD_ROOT/%{_datadir}/community-adaptation/adaptation-community.ini.in +%else + touch $RPM_BUILD_ROOT/%{_datadir}/community-adaptation/adaptation-community.ini.in +%endif mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/ -sed -e "s\|@FLAVOUR@\|%{flavour}\|g" \ -%if "%{flavour}" == "devel" +%if "%{flavour}" == "testing" +sed -e "s\|@FLAVOUR@\|testing\|g" \ +%else +sed -e "s\|@FLAVOUR@\|devel\|g" \ -e "s\|sailfishos_%%(release)\|sailfish_latest_%%(arch)\|g" \ %endif adaptation-community-common.ini > $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community-common.ini
	Added	_service:tar_git:community-adaptation-testing-0.0.1+master.20170216210445.1.gb08e401.tar.bz2 ^
	Deleted	_service:tar_git:community-adaptation-testing-0.0.1.tar.bz2 ^
[-] [+]	Changed	_service:tar_git:community-adaptation.inc ^
@@ -16,22 +16,28 @@ %install -%if "%{flavour}" != "devel" +%if "%{flavour}" == "testing" touch $RPM_BUILD_ROOT/init_disable_telnet %endif mkdir -p $RPM_BUILD_ROOT/%{_datadir}/community-adaptation/ +%if "%{flavour}" != "localbuild" sed -e "s\|@FLAVOUR@\|%{flavour}\|g" \ -%if "%{flavour}" == "devel" +%if "%{flavour}" != "testing" -e "s\|sailfishos_%%(release)\|sailfish_latest_%%(arch)\|g" \ %endif adaptation-community.ini.in > $RPM_BUILD_ROOT/%{_datadir}/community-adaptation/adaptation-community.ini.in +%else + touch $RPM_BUILD_ROOT/%{_datadir}/community-adaptation/adaptation-community.ini.in +%endif mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/ -sed -e "s\|@FLAVOUR@\|%{flavour}\|g" \ -%if "%{flavour}" == "devel" +%if "%{flavour}" == "testing" +sed -e "s\|@FLAVOUR@\|testing\|g" \ +%else +sed -e "s\|@FLAVOUR@\|devel\|g" \ -e "s\|sailfishos_%%(release)\|sailfish_latest_%%(arch)\|g" \ %endif adaptation-community-common.ini > $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community-common.ini