- make build with KDE / WKallet optional to fix build with SLE 12

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=185

subversion.changes

@@ -1,9 +1,10 @@
 -------------------------------------------------------------------
-Sat Nov  1 22:17:40 UTC 2014 - andreas.stieger@gmx.de
+Sat Nov  1 22:56:00 UTC 2014 - andreas.stieger@gmx.de
 
 - Add a versioned runtime requirement for sqlite and pass it to
   configure via --enable-sqlite-compatibility-version to allow
   running with sqlite older than at build time but compatible.
+- make build with KDE / WKallet optional to fix build with SLE 12
 
 -------------------------------------------------------------------
 Sat Sep 27 22:56:01 UTC 2014 - andreas.stieger@gmx.de

subversion.spec

@@ -27,6 +27,7 @@
 %define	apache_sysconfdir	%(%{apxs} -q SYSCONFDIR)
 %define apache_mmn          %(MMN="$(%{apxs} -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN")
 %define sqlite_minimum_version 3.7.12
+%define with_kde 0%{?suse_version} != 1315
 %if 0%{?suse_version} > 1140
 %define with_systemd 1
 BuildRequires:  pkgconfig(systemd)
@@ -76,11 +77,8 @@ BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  junit
-BuildRequires:  kdelibs4-core
 BuildRequires:  krb5-devel
 BuildRequires:  libgnome-keyring-devel
-BuildRequires:  libkde4-devel
-BuildRequires:  libqt4-devel
 BuildRequires:  libserf-devel >= 1.2.1
 BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
@@ -114,6 +112,11 @@ BuildRequires:  wget
 %if %{with python_ctypes}
 BuildRequires:  ctypesgen
 %endif
+%if %{with_kde}
+BuildRequires:  kdelibs4-core
+BuildRequires:  libkde4-devel
+BuildRequires:  libqt4-devel
+%endif
 
 %description
 Subversion exists to be universally recognized and adopted as an open-source,
@@ -188,12 +191,14 @@ Requires:       subversion = %{version}
 The subversion-server package adds the Subversion server Apache module
 to the Apache directories and configuration.
 
+%if %{with_kde}
 %package -n libsvn_auth_kwallet-1-0
 Summary:        A Concurrent Versioning system similar to but better than CVS
 Group:          Development/Tools/Version Control
 
 %description -n libsvn_auth_kwallet-1-0
 Provides KWallet integration for Subversion version control system.
+%endif
 
 %package -n libsvn_auth_gnome_keyring-1-0
 Summary:        A Concurrent Versioning system similar to but better than CVS
@@ -282,7 +287,9 @@ export LDFLAGS="-pie"
 	--with-sqlite="%{_prefix}" \
 	--enable-sqlite-compatibility-version=%{sqlite_minimum_version} \
 	--with-gnome-keyring \
+%if %{with_kde}
 	--with-kwallet \
+%endif
 	--disable-mod-activation \
 	--with-libmagic \
 	--disable-static
@@ -462,9 +469,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
 
 %postun -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
 
+%if %{with_kde}
 %post -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
 
 %postun -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
+%endif
 
 %files -f files.subversion
 %defattr(-,root,root)
@@ -565,10 +574,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
 %{_libdir}/libsvn_auth_gnome_keyring-1.so.0
 %{_libdir}/libsvn_auth_gnome_keyring-1.so.0.*
 
+%if %{with_kde}
 %files -n libsvn_auth_kwallet-1-0
 %defattr(-,root,root)
 %{_libdir}/libsvn_auth_kwallet-1.so.0
 %{_libdir}/libsvn_auth_kwallet-1.so.0.*
+%endif
 
 %if 0%{?suse_version} > 1130
 %files bash-completion