From 831e38e32a38ab3ba051e61ae8fa8c008721c380 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 3 Dec 2020 14:12:17 +0000
Subject: [PATCH] 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/subversion.git#fcaaaff855186d439c6963c18daa0b33735ca7ba
---
 subversion.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/subversion.spec b/subversion.spec
index 2eb501f..a9b94aa 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,7 +1,7 @@
 # set to zero to avoid running test suite
 %bcond_without tests
 
-%if 0%{?rhel} && 0%{?eln}
+%if 0%{?rhel} || 0%{?eln}
 %bcond_with kwallet
 %else
 %bcond_without kwallet
@@ -56,7 +56,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.14.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: ASL 2.0
 URL: https://subversion.apache.org/
 
@@ -569,6 +569,9 @@ make check-javahl
 %endif
 
 %changelog
+* Thu Dec  3 2020 Joe Orton <jorton@redhat.com> - 1.14.0-9
+- fix KWallet conditional (#1902598)
+
 * Mon Nov 30 2020 Jan Grulich <jgrulich@redhat.com> - 1.14.0-8
 - Disable KWallet for RHEL and ELN
   Resolves: bz#1902598