Changes - SailfishOS Open Build Service

Changes of Revision 31

[-] [+]	Changed	_service:tar_git:droid-config-titan.spec
@@ -86,7 +86,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1.2.3+master.20180406221021.6.g7664f5a +Version: 1.2.3+master.20190330083439.13.g1b29cb5 Release: 1 Group: Configs License: GPLv2 @@ -152,8 +152,8 @@ Requires: ohm-plugin-ruleengine Requires: ohm-plugin-profile Requires: ohm-plugin-route -Requires: pulseaudio-modules-nemo-common >= 8.0.24 -Requires: pulseaudio-policy-enforcement >= 8.0.33 +Requires: pulseaudio-modules-nemo-common >= 11.1.24 +Requires: pulseaudio-policy-enforcement >= 11.1.35 Requires: policy-settings-common >= 0.7.3 Obsoletes: ohm-config <= 1.1.15 # ohm-configs-default should not be installed ever, thus no version @@ -189,12 +189,12 @@ %package pulseaudio-settings Summary: PulseAudio settings for %{rpm_device} hw Provides: droid-config-pulseaudio-settings -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 +Requires: pulseaudio >= 11.1+git4 +Requires: pulseaudio-modules-nemo-parameters >= 11.1.24 +Requires: pulseaudio-modules-nemo-stream-restore >= 11.1.24 +Requires: pulseaudio-modules-nemo-mainvolume >= 11.1.24 +Requires: pulseaudio-modules-droid >= 11.1.66 +Requires: pulseaudio-policy-enforcement >= 11.1.35 Provides: pulseaudio-settings %description pulseaudio-settings @@ -324,7 +324,7 @@ copy_files_from() { config_dir=$1 if [ -d $config_dir ]; then - (cd $config_dir; find . $ -type f -or -type l $ -print ) \| sed 's/^.//' >> tmp/droid-config.files + (cd $config_dir; find . $ -type f -o -type l $ -print ) \| sed 's/^.//' >> tmp/droid-config.files cp -Rf $config_dir/* $RPM_BUILD_ROOT/ fi } @@ -434,6 +434,18 @@ /usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_common}/patterns/common -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release} /usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_path}/patterns/ -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release} +delete_patterns() { + deletelist=$1 + if [ -e $deletelist ]; then + egrep -v '^#\|^$' $deletelist \| ( + while read file; do + rm $RPM_BUILD_ROOT/$file + done) + fi +} + +delete_patterns delete_pattern_%{rpm_device}.list + %if 0%{!?pixel_ratio:1} %define pixel_ratio 1.0 %endif @@ -490,10 +502,6 @@ sed -e 's\|@DEVICE@\|%{rpm_device}\|g' %{dcd_path}/kickstart/pack_package-droid-updater > $DEST_UPDATER \|\| true fi -# post_nochroot -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/ -cp %{dcd_common}/kickstart/post_nochroot/hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/%{rpm_device} - # and attachments (override if there is one) mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment cp -f %{dcd_common}/kickstart/attachment_hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment/%{rpm_device} @@ -621,6 +629,14 @@ %endif %if 0%{?have_bluetooth:1} +%posttrans bluez4 +rm -rf /etc/bluetooth \|\| : +ln -s bluez4/bluetooth /etc/bluetooth \|\| : + +%posttrans bluez5 +rm -rf /etc/bluetooth \|\| : +ln -s bluez5/bluetooth /etc/bluetooth \|\| : + %files bluez4 -f tmp/bluez4.files %defattr(644,root,root,-)
	Deleted	_service:tar_git:droid-config-titan-1.2.3+master.20180406221021.6.g7664f5a.tar.bz2 ^
	Added	_service:tar_git:droid-config-titan-1.2.3+master.20190330083439.13.g1b29cb5.tar.bz2 ^