Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sof-firmware for openSUSE:Factory checked in at 2021-06-02 22:12:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sof-firmware (Old) and /work/SRC/openSUSE:Factory/.sof-firmware.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sof-firmware" Wed Jun 2 22:12:19 2021 rev:13 rq:896859 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/sof-firmware/sof-firmware.changes 2021-04-12 12:39:22.393509376 +0200 +++ /work/SRC/openSUSE:Factory/.sof-firmware.new.1898/sof-firmware.changes 2021-06-02 22:12:45.368076558 +0200 @@ -1,0 +2,7 @@ +Wed Jun 2 10:13:30 CEST 2021 - [email protected] + +- Fix the build on TW after UsrMerge +- Drop the ugly workaround for the symlink fixups again, as we + moved the base directory due to UsrMerge + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sof-firmware.spec ++++++ --- /var/tmp/diff_new_pack.xniheJ/_old 2021-06-02 22:12:45.852075361 +0200 +++ /var/tmp/diff_new_pack.xniheJ/_new 2021-06-02 22:12:45.852075361 +0200 @@ -80,42 +80,11 @@ %install mkdir -p %{buildroot}%{_firmwaredir} -ROOT=%{buildroot} SOF_VERSION=v%{version} sh ./go.sh +fwdir=%{_firmwaredir}/intel +fwdir=${fwdir#/} +ROOT=%{buildroot} INTEL_PATH="$fwdir" SOF_VERSION=v%{version} sh ./go.sh %fdupes -s %{buildroot} -# A grand opening of a monkey theater now: -# as rpm cannot handle the transition from a directory to a symlinked -# directory, we need many very ugly tricks to work around it. -# See bsc#1180287 and bsc#1181554 - -# At first, rename the old directory that will be overriden via symlink. -# This has to be done at pre, not preun. Without this workaround, cpio -# expansion fails. -%pre -if test -d %{_firmwaredir}/intel/sof-tplg; then - if ! test -h %{_firmwaredir}/intel/sof-tplg; then - mv %{_firmwaredir}/intel/sof-tplg %{_firmwaredir}/intel/sof-tplg.old - fi -fi - -# At next, rename the symlink at post if the old package contained the -# directory; it's needed to avoid the old package removing the new contents -# mistakenly. The old contents are removed here instead. -%post -if test -d %{_firmwaredir}/intel/sof-tplg.old; then - mv %{_firmwaredir}/intel/sof-tplg %{_firmwaredir}/intel/sof-tplg.new - rm -rf %{_firmwaredir}/intel/sof-tplg.old -fi - -# At last in posttrans, recover the symlink again; -# it's the only place we can use after the old package triggers run -%posttrans -if test -h %{_firmwaredir}/intel/sof-tplg.new; then - mv %{_firmwaredir}/intel/sof-tplg.new %{_firmwaredir}/intel/sof-tplg - # remove stale files - rm -f %{_firmwaredir}/intel/sof-tplg\;* -fi - %files %license LICENCE.* %doc README.*
