Skip to content

Commit e9deed3

Browse files
committed
make-srpm.sh: conflict with csmock-plugin-shellcheck <= 2.5
The following upstream commit is needed for csmock-plugin-shellcheck to work with up2date csdiff/csgrep: kdudka/csmock@48b09b3a
1 parent 3bdd3c8 commit e9deed3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

make-srpm.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ License: GPLv3+
9494
URL: https://github.com/kdudka/csdiff
9595
Source0: 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+
97101
BuildRequires: boost-devel
98102
BuildRequires: cmake
99103
BuildRequires: gcc-c++
@@ -107,7 +111,6 @@ defect lists using various filtering predicates.
107111
%if %{with python2}
108112
%package -n python2-%{name}
109113
Summary: Python interface to csdiff for Python 2
110-
Conflicts: %{name} <= 1.2.3
111114
%if 0%{?fedora} > 28
112115
BuildRequires: boost-python2-devel
113116
%endif

0 commit comments

Comments
 (0)