Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-macros for openSUSE:Factory checked in at 2021-03-17 20:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old) and /work/SRC/openSUSE:Factory/.qt6-macros.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-macros" Wed Mar 17 20:14:08 2021 rev:2 rq:869497 version:20210111 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes 2020-12-18 19:58:34.834010674 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-macros.new.2401/qt6-macros.changes 2021-03-17 20:15:42.190968826 +0100 @@ -1,0 +2,9 @@ +Mon Jan 11 15:06:44 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Add a %pre scriplet for QCH doc packages. + Starting with 6.0.1, the qch files are installed directly into %_qt6_docdir + instead of %_qt6_docdir/<qch doc>.qch/. + RPM can't upgrade packages if a directory is replaced by something + else, we need a %pre scriptlet that will remove existing folders. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-macros.spec ++++++ --- /var/tmp/diff_new_pack.kGrvNN/_old 2021-03-17 20:15:42.994969924 +0100 +++ /var/tmp/diff_new_pack.kGrvNN/_new 2021-03-17 20:15:42.998969930 +0100 @@ -17,7 +17,7 @@ Name: qt6-macros -Version: 20201210 +Version: 20210111 Release: 0 Summary: RPM macros for Qt6 packages License: MIT ++++++ macros.qt6 ++++++ --- /var/tmp/diff_new_pack.kGrvNN/_old 2021-03-17 20:15:43.046969995 +0100 +++ /var/tmp/diff_new_pack.kGrvNN/_new 2021-03-17 20:15:43.050970001 +0100 @@ -252,6 +252,16 @@ %qt6_install_docs \ DESTDIR=%{buildroot} cmake --build \\%{__qt6_build_options} -t install_docs_qt%{__qt6_module_name} \ + # in Qt 6.0.0, %%{_qt6_docdir}/*.qch are folders which contain \ + # files with the same name. \ + # Starting with 6.0.1, the file is installed in %%{_qt6_docdir} directly. \ + # We need a %%pre scriptlet to remove the old folder before upgrading. \ + _current_dir=`pwd` \ + pushd %{buildroot}%{_qt6_docdir} \ + for qch_file in *.qch ; do \ + echo "if [ -d %{_qt6_docdir}/${qch_file} ] ; then rm -r %{_qt6_docdir}/${qch_file} ; fi" >> ${_current_dir}/qch.pre \ + done \ + popd \ %{nil} #-------------------------------------------------------------- @@ -287,6 +297,8 @@ %description -n %{__qt6_doc_package_name}-qch \ This package contains documentation for %{name} in QCH format. \ \ +%pre -n %{__qt6_doc_package_name}-qch -f qch.pre \ +\ %files -n %{__qt6_doc_package_name}-html \ %dir %{_qt6_docdir} \ %{_qt6_docdir}/* \
