Changes - SailfishOS Open Build Service

Changes of Revision 26

[-] [+]	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.20180920142920.11.gef125fc +Version: 1.2.3+master.20190320195822.12.g4239c3e Release: 1 Group: Configs License: GPLv2 @@ -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 @@ -617,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.20180920142920.11.gef125fc.tar.bz2 ^
	Added	_service:tar_git:droid-config-titan-1.2.3+master.20190320195822.12.g4239c3e.tar.bz2 ^