From 6937c2726c73bf8795a00c8087d6a235fbf6de97 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Oct 20 2020 07:01:41 +0000
Subject: update to latest upstream release (1.9.0)


---

diff --git a/csdiff-1.8.0.tar.xz.asc b/csdiff-1.8.0.tar.xz.asc
deleted file mode 100644
index 68eaa40..0000000
--- a/csdiff-1.8.0.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAl873McACgkQhz2zdXKj
-ezZdZg//XYwyS2NBBdFaWCQnjeayj3/1YqpQmV68dYQGJ0W+5R9ngS/mpyMa0YvW
-0pKhdAJFfRZ1ZcRRnDUs2YmI4CN24qUbmxqkiSpGqBP/IxVn1fzPx0QRxtZo+Xgd
-vMrZ4uwQuqFN6cWYHqketqxWqVcZD0+lfwUvSNDd54388f/DjZzWaatq0gbApR5Z
-ijwPrll3zemRVQaGIQt7YYkFx3T0CffduOc48V7HdOdwVS1ePygSjYSxt2th16hy
-hlL7FY1wLwEeCWW1LIwGWutMqFJYNjxXQ5PG5ZhydU3PvBJbY1FcdDTx66k6QYqx
-ELwihRV+vJZXi2EjJua+rcIU7cBI7KTZDyXnOry6ZgJdVes6cmI0KflfIL3N+Xei
-PaEasAuRrXQ0VQb4CGgqZ3MfeqpqW40Y7/OgW9tr6vULUOor4moPzDcskjCIRhrR
-jus+n7xelJPbQ3hPwk3woKrqAhVRmbvj5hgRCrGOk6Jf0FN2suw0OEahFhk4b2w7
-FoXOj6pBJ3ZN96WSChdpjgrtrSwGHoi4YfTO3G+syyB8nvgLZpklhM0ucE7KhJQ7
-LLvDE9NiMDDfaf5iZe6D3iKxaWBNn/w/CXuLH6N9vqcCl33FqGf1904KPqgrbnlp
-r18V06JFxyegmbarqBvep5Rk0v8/KTidxXie5evUv3DsVp5Ajx0=
-=MNu8
------END PGP SIGNATURE-----
diff --git a/csdiff-1.9.0.tar.xz.asc b/csdiff-1.9.0.tar.xz.asc
new file mode 100644
index 0000000..62855ca
--- /dev/null
+++ b/csdiff-1.9.0.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAl+NwkIACgkQhz2zdXKj
+ezYkTg/+MsGW+HDmnW7CbhKj1Xi8exELB3E4x+9UAoKQStEENt3c6q1HY4yWaIkz
+kp1eluGkX8KQlSALDB4gC8Go4UpLJ056qZnKiCREYUAM7Go6WFQyMVRKm91L1g7R
+cAlc6qAQIVKOn260HuJpQA2ii7UPd01qJXFo/s0JUcjWyvmJSdic7TXMerz/Lsuu
+ZdsvuULyHamGmG1qzrS86qpKNTcPJQGBmSmAxQ9AkqI08RubrvC9IkEDt1pG8wqo
+qjhywUnYuimZUFWMwR+Qr58324QL/CUAfXnHILj3BVnnkysa+ZFTNtlO9ICX9cC/
+BYMHvxkFF2Q7QsyYb8kVEp50n7zsyRuK5D2YgvxSW0rseAtYY+REYjwzjoA8BxNY
+nqJ5p7FgGHQevL/u4SJ9h/s78cqhZehS3/Xg1o5gFm52y9ATOs+kKzaQCfvzZh3j
+cPip/vT1gRuRR4jysRknHMhOeP1UfdGEtdX2SOXbGEi6dLe9xBRQYxdkEzVAtSMQ
+36zG53kgbEY1YJvEVpH+xUQfboZBbCBU+wy9GGU0nik+TJPQzywBrNszQGIAV2fh
+ULNpRwS5jXP/flpqBhjeNBOsnYcXK/yLMIuS6eNyzacmnkiusuvNogWq/f/KDo+K
+4d/mjVr8oreS/S3KxYjdlS9tKzoGjRbhIr4nMQ2oE+827Jv+K6k=
+=7aVw
+-----END PGP SIGNATURE-----
diff --git a/csdiff.spec b/csdiff.spec
index c6af219..af612f2 100644
--- a/csdiff.spec
+++ b/csdiff.spec
@@ -15,7 +15,7 @@
 %endif
 
 Name:       csdiff
-Version:    1.8.0
+Version:    1.9.0
 Release:    1%{?dist}
 Summary:    Non-interactive tools for processing code scan results in plain-text
 
@@ -23,6 +23,10 @@ License:    GPLv3+
 URL:        https://github.com/kdudka/csdiff
 Source0:    https://github.com/kdudka/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
 
+# the following upstream commit is needed to work with up2date csdiff/csgrep
+# https://github.com/kdudka/csmock/commit/48b09b3a
+Conflicts:  csmock-plugin-shellcheck <= 2.5
+
 BuildRequires: boost-devel
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -36,7 +40,6 @@ defect lists using various filtering predicates.
 %if %{with python2}
 %package -n python2-%{name}
 Summary:        Python interface to csdiff for Python 2
-Conflicts:      %{name} <= 1.2.3
 %if 0%{?fedora} > 28
 BuildRequires:  boost-python2-devel
 %endif
@@ -128,6 +131,9 @@ install -vm0644 %{_target_platform}-py3/pycsdiff.so %{buildroot}%{python3_sitear
 %endif
 
 %changelog
+* Tue Oct 20 2020 Kamil Dudka <kdudka@redhat.com> 1.9.0-1
+- update to latest upstream release
+
 * Wed Aug 19 2020 Kamil Dudka <kdudka@redhat.com> 1.8.0-1
 - update to latest upstream release
 
diff --git a/sources b/sources
index d83d671..d375bf2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (csdiff-1.8.0.tar.xz) = cad87998166acbbc7f2e82dba718e01148c5463c94f220e527697ffb79e6a2bb157d0a2db167abaae294bf3525a9769405cdee956dbe9b3970e45b0a5be0db3f
+SHA512 (csdiff-1.9.0.tar.xz) = 046e439640938b86ca1e2197d5e99935d7461b3b4698ab71faa5c46190f2fff4bf8d570656cc47a2806218983d7b0dbec2a1cc0131c9d586af2f50b738ee005b