Changes - SailfishOS Open Build Service

Changes of Revision 13

[-] [+]	Changed	_service:tar_git:droid-config-lux.spec
@@ -91,7 +91,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1.0.0+master.20180707190316.8.ga6ae3fb +Version: 1.0.0+cm.14.1.20190224110519.11.gbfc9f23 Release: 1 Group: Configs License: GPLv2 @@ -194,7 +194,7 @@ %package pulseaudio-settings Summary: PulseAudio settings for %{rpm_device} hw Provides: droid-config-pulseaudio-settings -Requires: pulseaudio >= 11.1 +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 @@ -329,7 +329,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 } @@ -439,6 +439,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 @@ -622,6 +634,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,-)
[-] [+]	Changed	_service ^
@@ -1,11 +1,11 @@ <services> <service name="webhook"> <param name="repourl">https://github.com/VerdandiTeam/droid-config-lux.git</param> - <param name="branch">master</param> + <param name="branch">cm-14.1</param> </service> <service name="tar_git"> <param name="url">https://github.com/VerdandiTeam/droid-config-lux.git</param> - <param name="branch">master</param> + <param name="branch">cm-14.1</param> <param name="revision"/> <param name="token"/> <param name="debian">N</param>
	Added	_service:tar_git:droid-config-lux-1.0.0+cm.14.1.20190224110519.11.gbfc9f23.tar.bz2 ^
	Deleted	_service:tar_git:droid-config-lux-1.0.0+master.20180707190316.8.ga6ae3fb.tar.bz2 ^