Changes - SailfishOS Open Build Service

Changes of Revision 17

[-] [+]	Changed	_service:tar_git:droid-config-armani.spec
@@ -10,6 +10,8 @@ # We assume most devices will %define have_modem 1 %define community_adaptation 1 +%define ofono_enable_plugins bluez5,hfp_ag_bluez5 +%define ofono_disable_plugins bluez4,dun_gw_bluez4,hfp_ag_bluez4,hfp_bluez4,dun_gw_bluez5,hfp_bluez5 Provides: ofono-configs # This file should be %%included into a device specific spec file @@ -83,7 +85,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 0.0.5 +Version: 0.0.5+master.20180501220043.4.gb5d0d77 Release: 1 Group: Configs License: GPLv2 @@ -149,9 +151,9 @@ Requires: ohm-plugin-ruleengine Requires: ohm-plugin-profile Requires: ohm-plugin-route -Requires: pulseaudio-modules-nemo-common >= 4.0.11 -Requires: pulseaudio-policy-enforcement >= 4.0.8 -Requires: policy-settings-common >= 0.2.7 +Requires: pulseaudio-modules-nemo-common >= 8.0.24 +Requires: pulseaudio-policy-enforcement >= 8.0.33 +Requires: policy-settings-common >= 0.7.3 Obsoletes: ohm-config <= 1.1.15 # ohm-configs-default should not be installed ever, thus no version # specification defined here. @@ -186,12 +188,12 @@ %package pulseaudio-settings Summary: PulseAudio settings for %{rpm_device} hw Provides: droid-config-pulseaudio-settings -Requires: pulseaudio >= 4.0 -Requires: pulseaudio-modules-nemo-parameters >= 4.0.11 -Requires: pulseaudio-modules-nemo-stream-restore >= 4.0.11 -Requires: pulseaudio-modules-nemo-mainvolume >= 4.0.11 -Requires: pulseaudio-modules-droid >= 4.0.6 -Requires: pulseaudio-policy-enforcement >= 6.0.20 +Requires: pulseaudio >= 8.0 +Requires: pulseaudio-modules-nemo-parameters >= 8.0.24 +Requires: pulseaudio-modules-nemo-stream-restore >= 8.0.24 +Requires: pulseaudio-modules-nemo-mainvolume >= 8.0.24 +Requires: pulseaudio-modules-droid >= 8.0.63 +Requires: pulseaudio-policy-enforcement >= 8.0.33 Provides: pulseaudio-settings %description pulseaudio-settings @@ -437,13 +439,23 @@ sed --in-place 's\|@PIXEL_RATIO@\|%{pixel_ratio}\|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt +%define start_drag_distance %(awk 'BEGIN{print int(%{pixel_ratio}20)}') +sed --in-place 's\|@START_DRAG_DISTANCE@\|%{start_drag_distance}\|' %{buildroot}/etc/xdg/QtProject/QPlatformTheme.conf + # icon_res can be only one of 1.0, 1.25, 1.5, 1.75 or 2.0 use pixel_ratio and pick closest one %define icon_res %(awk 'BEGIN {a=int((%{pixel_ratio}-0.125)/0.25)0.25+0.25;a=(a<=1?"1.0":(a>=2.0?"2.0":a));print a }') sed --in-place 's\|@ICON_RES@\|%{icon_res}\|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt sed --in-place 's\|@ICON_RES@\|%{icon_res}\|' %{buildroot}/usr/share/package-groups/* +# In localbuilds it will break the system, because droid-hal-version-$DEVICE is +# not built yet. Also it will pull many unnecessary things into the SDK target. +%if 0%{?_obs_build_project:1} sed --in-place 's\|@DEVICE@\|%{rpm_device}\|' %{buildroot}/etc/zypp/systemCheck.d/.check +%else +sed --in-place '/systemCheck.d/d' tmp/droid-config.files +rm -f %{buildroot}/etc/zypp/systemCheck.d/.check +%endif # SSU board mapping for hardware adaptation %if 0%{!?provides_own_board_mapping:1} @@ -455,11 +467,12 @@ -e "s\|%VENDOR_PRETTY%\|%{vendor_pretty}\|g" \ -e "s\|%ARCH%\|%{_target_cpu}\|g" \ droid-configs-device/ssu/board-mappings.d/05-sfe.ini.in >$RPM_BUILD_ROOT/%{board_mapping_file} +%endif %if 0%{?community_adaptation:1} # Community ports have their adaptation repos on http://build.merproject.org # Until we figure out how ssu works, we'll prevent the default adaptation0 from being created... -sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_file} +sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/.ini # ...and make a separate adaptation repo for community: mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/ sed -e 's\|@DEVICE@\|%{rpm_device}\|g' \ @@ -468,8 +481,6 @@ >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini %endif -%endif - # Copy kickstart packs (for %%{rpm_device}-kickstart-configuration) mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device} DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris @@ -555,8 +566,8 @@ ################################################################ %post # Force an update of ssu repositories -touch %{board_mapping_dir}/ -touch %{_datadir}/ssu/features.d/* +touch %{board_mapping_dir}/* \|\| : +touch %{_datadir}/ssu/features.d/* \|\| : # To add additional post scripts, one can define those as part # of additional_post_scripts macro.
[-] [+]	Changed	_service ^
@@ -1,12 +1,8 @@ <services> - <service name="webhook"> - <param name="repourl">https://github.com/litew/droid-config-armani.git</param> - <param name="branch">master</param> - </service> <service name="tar_git"> <param name="url">https://github.com/litew/droid-config-armani.git</param> <param name="branch">master</param> - <param name="revision">6d994070ad123715b6d95188ccae37596a2d3b27</param> + <param name="revision">HEAD</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Added	_service:tar_git:droid-config-armani-0.0.5+master.20180501220043.4.gb5d0d77.tar.bz2 ^
	Deleted	_service:tar_git:droid-config-armani-0.0.5.tar.bz2 ^