Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/scap-workbench.git#3e7deda53e127f249e484691cc5383422200bc77
This commit is contained in:
DistroBaker 2020-10-27 22:18:49 +01:00 committed by Petr Šabata
parent 65516ea622
commit f6bffe523c
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index c9a0937..e811e83 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -409,7 +409,7 @@ void MainWindow::openFile(const QString& path, bool reload)
// Refill mFSWatch after opening file
mFSWatch->removePaths(mFSWatch->files());
- for (const QString path : mScanningSession->getOriginalClosure())
+ for (const QString &path : mScanningSession->getOriginalClosure())
{
mFSWatch->addPath(path);
}

View File

@ -2,7 +2,7 @@
Name: scap-workbench
Version: 1.2.1
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Scanning, tailoring, editing and validation tool for SCAP content
License: GPLv3+
@ -10,6 +10,7 @@ URL: http://www.open-scap.org/tools/scap-workbench
Source0: https://github.com/OpenSCAP/scap-workbench/releases/download/%{version}/scap-workbench-%{version}.tar.bz2
Patch1: scap-workbench-1.2.2-fix-qt-deprecated-pr-259.patch
Patch2: scap-workbench-1.2.2-replace-obsolete-Qstring-SkipEmptyParts-pr-266.patch
Patch3: %{name}-gcc11.patch
BuildRequires: cmake >= 2.6
BuildRequires: qt5-qtbase-devel >= 5.0.0
@ -42,6 +43,7 @@ content. The tool is based on OpenSCAP library.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%cmake
@ -68,6 +70,9 @@ content. The tool is based on OpenSCAP library.
%doc %{_pkgdocdir}/README.md
%changelog
* Fri Oct 16 2020 Jeff Law <law@redhat.com> - 1.2.1-7
- Use reference to avoid range-loop-construct diagnostic
* Wed Oct 07 2020 Jan Černý <jcerny@redhat.com> - 1.2.1-6
- Replace obsolete QString::SkipEmptyParts