Changes - SailfishOS Open Build Service

Changes of Revision 25

[-] [+]	Changed	_service:tar_git:droid-config-victara.spec
@@ -95,7 +95,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1.1+master.20211213072731.19.ga8d660a +Version: 1.1+master.20230623173317.20.g6356b4b %if 0%{?_obs_build_project:1} Release: 1 %else @@ -247,36 +247,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 @@ -340,8 +310,10 @@ "modules" "oneshot.d" "startup" + "sysctl.d" "systemd/system" "systemd/user" + "sysusers.d" "tmpfiles.d" "udev" ) @@ -383,7 +355,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 } @@ -477,8 +449,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 @@ -488,7 +458,7 @@ echo "%defattr(-,root,root,-)" > tmp/pulseaudio-settings.files grep pulse tmp/droid-config.files > tmp/pulseaudio-settings.files sed --in-place '/pulse/d' tmp/droid-config.files -sed --in-place '/preinit/d' tmp/droid-config.files +sed --in-place '/\/startup\/preinit\//d' tmp/droid-config.files grep "/dconf/db/" tmp/droid-config.files > tmp/sailfish-settings.files sed --in-place '/\/dconf\/db\//d' tmp/droid-config.files grep -e "flash-partition" -e "platform-updates" tmp/droid-config.files > tmp/flashing.files @@ -713,17 +683,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 @@ -781,7 +744,9 @@ # Needed for /dev/touchscreen symlink Requires: qt5-plugin-generic-evdev -Requires: pulseaudio-modules-droid +Requires: ofono-ril-plugin + +Requires: pulseaudio-modules-droid-jb2q Requires: pulseaudio-modules-droid-glue # for audio recording to work: Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
	Deleted	_service:tar_git:droid-config-victara-1.1+master.20211213072731.19.ga8d660a.tar.bz2 ^
	Added	_service:tar_git:droid-config-victara-1.1+master.20230623173317.20.g6356b4b.tar.bz2 ^