File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed
Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -94,6 +94,10 @@ License: GPLv3+
9494URL: https://github.com/kdudka/csdiff
9595Source0: https://github.com/kdudka/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
9696
97+ # the following upstream commit is needed to work with up2date csdiff/csgrep
98+ # https://github.com/kdudka/csmock/commit/48b09b3a
99+ Conflicts: csmock-plugin-shellcheck <= 2.5
100+
97101BuildRequires: boost-devel
98102BuildRequires: cmake
99103BuildRequires: gcc-c++
@@ -107,7 +111,6 @@ defect lists using various filtering predicates.
107111%if %{with python2}
108112%package -n python2-%{name}
109113Summary: Python interface to csdiff for Python 2
110- Conflicts: %{name} <= 1.2.3
111114%if 0%{?fedora} > 28
112115BuildRequires: boost-python2-devel
113116%endif
You can’t perform that action at this time.
0 commit comments