Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt-fsarchiver for openSUSE:Factory checked in at 2021-06-01 10:37:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-fsarchiver (Old) and /work/SRC/openSUSE:Factory/.qt-fsarchiver.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-fsarchiver" Tue Jun 1 10:37:38 2021 rev:6 rq:895775 version:0.8.5_22 Changes: -------- --- /work/SRC/openSUSE:Factory/qt-fsarchiver/qt-fsarchiver.changes 2021-05-23 23:31:04.496620228 +0200 +++ /work/SRC/openSUSE:Factory/.qt-fsarchiver.new.1898/qt-fsarchiver.changes 2021-06-01 10:38:51.512955731 +0200 @@ -1,0 +2,7 @@ +Thu May 27 13:23:12 UTC 2021 - opensuse.lietuviu.ka...@gmail.com + +- Add fix-mbr-message.patch to fix the error message when writing + back the MBR. +- Include documentation for qt-fsarchiver-terminal. + +------------------------------------------------------------------- New: ---- fix-mbr-message.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-fsarchiver.spec ++++++ --- /var/tmp/diff_new_pack.YkrBzU/_old 2021-06-01 10:38:51.996956555 +0200 +++ /var/tmp/diff_new_pack.YkrBzU/_new 2021-06-01 10:38:52.000956562 +0200 @@ -27,6 +27,8 @@ URL: https://sourceforge.net/projects/qt-fsarchiver Source0: %{URL}/files/source/%{name}/%{name}-%{hyphen_version}.tar.gz Source1: %{URL}/files/source/%{name}-terminal/%{name}-terminal-%{terminal_version}.tar.gz +# PATCH-FIX-UPSTREAM fix-mbr-message.patch +Patch1: fix-mbr-message.patch BuildRequires: e2fsprogs-devel BuildRequires: libattr-devel BuildRequires: libgcrypt-devel @@ -66,6 +68,7 @@ %prep %setup -q -n %{name} %setup -T -D -a 1 -n %{name} +%autopatch -p1 rm -vf .qmake.stash rm -vf translations/*.qm @@ -89,14 +92,13 @@ # Install translations mkdir -p %{buildroot}%{_datadir}/qt5/translations/ install -m 0644 translations/*.qm %{buildroot}%{_datadir}/qt5/translations/ -# -terminal package contains the same documentation -rm -rf %{buildroot}%{_docdir}/%{name}-terminal %files %{_sbindir}/%{name} %{_sbindir}/%{name}.sh %{_sbindir}/%{name}-terminal %doc %{_docdir}/%{name} +%doc %{_docdir}/%{name}-terminal %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %exclude %{_datadir}/qt5/translations/%{name}*.qm ++++++ fix-mbr-message.patch ++++++ From: Dieter Baum <dieterb...@t-online.de> Date: 2021-05-27 15:09:00 +0200 Subject: error message when writing back the MBR for a user Upstream: sent Fix the error message when writing back the MBR diff a/src/mbr.cpp b/src/mbr.cpp --- a/src/mbr.cpp +++ b/src/mbr.cpp @@ -503,8 +503,8 @@ if (efiflag == 0) { QString text = tr("You may have selected an incorrect file. The hidden area to be restored has a size of ", "Sie haben eventuell eine falsche Datei ausgew??hlt. Der wiederherzustellende verborgene Bereich hat eine Gr????e von") + sA + - tr(" bytes. The hidden area of the disk ", " Byte. Der verborgene Bereich von der Festplatte ") + partition + tr(" has a size of ", " hat eine Gr????e von ") + Sektor_byte + tr(" bytes. Do you want to continue?", " Byte. Wollen Sie fortfahren?"); - if (size_ != sektor_byte && dialog_auswertung == 5 && cmb_mbr->currentIndex() == 3) { + tr(" bytes. The hidden area of the disk ", " Byte. Der verborgene Bereich von der Festplatte ") + partition + tr(" has a size of ", " hat eine Gr????e von ") + Sektor_byte_1 + tr(" bytes. Do you want to continue?", " Byte. Wollen Sie fortfahren?"); + if (size_ != sektor_byte && dialog_auswertung == 5 && cmb_mbr->currentIndex() == 3 && sektor_byte != 0 ) { ret = questionMessage(text); if (ret == 2) return 1;
