Changes - SailfishOS Open Build Service

Changes of Revision 37

[-] [+]	Changed	_service:tar_git:droid-config-titan.spec
@@ -43,6 +43,10 @@ # Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25) # packages_own_system: adaptation gets /system from rpm instead of device partition +# Image configuration: +# remove_sailfish_applications: set this if you do not want sailfish applications pattern +# remove_sailfish_ui: set this if you do not want sailfish ui pattern + # Overwriting other configs: # If your droid-config-$DEVICE needs to provide one or more device-specific # configuration files, do the following: @@ -85,7 +89,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1.2.3+master.20211105155824.23.g0d57b7c +Version: 1.2.3+master.20220412183344.24.g976553a %if 0%{?_obs_build_project:1} Release: 1 %else @@ -237,36 +241,6 @@ ################################################################ %if 0%{?have_bluetooth:1} -%package bluez4 -Summary: %{rpm_device} packages for BlueZ 4 -Conflicts: droid-config-%{rpm_device}-bluez5 -Provides: %{rpm_device}-bluez-configs - -Requires: bluez -Conflicts: bluez5 - -Requires: bluez-libs -Conflicts: bluez5-libs - -Requires: obexd -Conflicts: bluez5-obexd - -Requires: obexd-server -# no obexd-server equivalent in BlueZ 5, so no conflict - -Requires: kf5bluezqt-bluez4 -Conflicts: kf5bluezqt-bluez5 - -Provides: bluez-configs -Conflicts: bluez5-configs -Obsoletes: bluez-configs-sailfish -Obsoletes: bluez-configs-mer - -Requires: pulseaudio-modules-bluez4 - -%description bluez4 -%{summary}. - %package bluez5 Summary: %{rpm_device} packages for BlueZ 5 Conflicts: droid-config-%{rpm_device}-bluez4 @@ -328,9 +302,12 @@ do_not_move_to_lib64=( "firmware" "modules" + "oneshot.d" "startup" + "sysctl.d" "systemd/system" "systemd/user" + "sysusers.d" "tmpfiles.d" "udev" ) @@ -372,7 +349,7 @@ local files=$1 local file=$2 local dorm=$3 - [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file + [ "x$dorm" == "x1" ] && rm -f $RPM_BUILD_ROOT/$file grep -vE "$file" $files > tmp/$$.files mv tmp/$$.files $files } @@ -466,8 +443,6 @@ # We want to keep some files in separate subpackages. # NOTE: some files might get to wrong place with this because of string assumption. %if 0%{?have_bluetooth:1} -grep bluez4 tmp/droid-config.files > tmp/bluez4.files \|\| true -sed --in-place '/bluez4/d' tmp/droid-config.files grep bluez5 tmp/droid-config.files > tmp/bluez5.files \|\| true sed --in-place '/bluez5/d' tmp/droid-config.files %endif @@ -702,17 +677,10 @@ %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,-) - %files bluez5 -f tmp/bluez5.files %defattr(644,root,root,-) %endif @@ -720,8 +688,12 @@ %package -n patterns-sailfish-device-configuration-common-%{rpm_device} Summary: Jolla Configuration common +%if 0%{!?remove_sailfish_applications:1} Requires: patterns-sailfish-applications +%endif +%if 0%{!?remove_sailfish_ui:1} Requires: patterns-sailfish-ui +%endif # Sailfish OS CSD tool for hardware testing # needs some configuration to get all features working @@ -821,8 +793,9 @@ # For GPS Requires: geoclue-provider-hybris -# For Mozilla location services (online) -Requires: geoclue-provider-mlsdb + +# Telephony (RIL sockets) +Requires: ofono-ril-plugin # Fix for calls Requires: pulseaudio-modules-droid-glue
	Deleted	_service:tar_git:droid-config-titan-1.2.3+master.20211105155824.23.g0d57b7c.tar.bz2 ^
	Added	_service:tar_git:droid-config-titan-1.2.3+master.20220412183344.24.g976553a.tar.bz2 ^