From 2c15a59db364725484a2cf35600e27b99b6bac3519286d2c2f62913615e05c31 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 25 Aug 2020 16:43:12 +0000
Subject: [PATCH] - skip svndiff tools as those conflict with subversion

OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=23
---
 patchutils.changes |  1 +
 patchutils.spec    | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/patchutils.changes b/patchutils.changes
index 06afb64..d7c0933 100644
--- a/patchutils.changes
+++ b/patchutils.changes
@@ -8,6 +8,7 @@ Sun Aug 16 00:36:26 UTC 2020 - Dirk Mueller <dmueller@suse.com>
   * New filterdiff option --remove-timestamps.
   * Assorted other fixes and improvements. 
 - remove patchutils-0.2.30-tailsyntax.diff: obsolete
+- skip svndiff tools as those conflict with subversion
 
 -------------------------------------------------------------------
 Mon Dec 16 14:08:27 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
diff --git a/patchutils.spec b/patchutils.spec
index d59e116..e258cbc 100644
--- a/patchutils.spec
+++ b/patchutils.spec
@@ -58,7 +58,25 @@ install -m 0644 -t %{buildroot}%{_mandir}/man1/ doc/*.1
 %files
 %license COPYING
 %doc BUGS README
-%{_bindir}/*
+%{_bindir}/combinediff
+%{_bindir}/dehtmldiff
+%{_bindir}/editdiff
+%{_bindir}/espdiff
+%{_bindir}/filterdiff
+%{_bindir}/fixcvsdiff
+%{_bindir}/flipdiff
+%{_bindir}/gitdiff
+%{_bindir}/gitdiffview
+%{_bindir}/grepdiff
+%{_bindir}/interdiff
+%{_bindir}/lsdiff
+%{_bindir}/patchview
+%{_bindir}/recountdiff
+%{_bindir}/rediff
+%{_bindir}/splitdiff
+%exclude %{_bindir}/svndiff
+%exclude %{_bindir}/svndiffview
+%{_bindir}/unwrapdiff
 %{_mandir}/man1/*.1%{?ext_man}
 
 %changelog