- Remove kwallet integration completely as it depends on kdelibs4

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

subversion.changes

@@ -8,6 +8,7 @@ Thu Apr 12 09:08:24 UTC 2018 - tchvatal@suse.com
   * https://subversion.apache.org/docs/release-notes/1.10.html
 - Convert dependencies to pkgconfig counterparts
 - Add dependency on liblz4 and utf8proc
+- Remove kwallet integration completely as it depends on kdelibs4
 - Refresh patches:
   * subversion-1.8.0-rpath.patch
   * subversion-no-build-date.patch
@@ -18,12 +19,6 @@ Thu Apr 12 09:08:24 UTC 2018 - tchvatal@suse.com
   * subversion-1.9.0-allow-httpd-2.4.6.patch, no longer required
 - Use %license (boo#1082318)
 
--------------------------------------------------------------------
-Thu Apr 12 08:19:41 UTC 2018 - tchvatal@suse.com
-
-- Reenable kwallet integration as kdelibs4 were ported to the
-  openssl-1.1
-
 -------------------------------------------------------------------
 Tue Dec 19 06:59:02 UTC 2017 - fstrba@suse.com
 

subversion.spec

@@ -20,15 +20,8 @@
 
 %define svngroup svn
 %define svnuser svn
-%{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
 %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %define sqlite_minimum_version 3.8.2
-# SLE does not ship KDE
-%if 0%{?is_opensuse} != 1
-%define with_kde 0
-%else
-%define with_kde 1
-%endif
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -103,11 +96,13 @@ Requires(post): %fillup_prereq
 Requires(pre):  pwdutils
 Recommends:     %{name}-bash-completion
 # workaround for boo#969159
-Conflicts:      libsvn_auth_kwallet-1-0 < %{version}
-Conflicts:      libsvn_auth_kwallet-1-0 > %{version}
 Conflicts:      libsvn_gnome_keyring-1-0 < %{version}
 Conflicts:      libsvn_gnome_keyring-1-0 > %{version}
 Provides:       subversion-javahl = %{version}-%{release}
+# In a case we migrate from system that had the kwallet integration we need it
+# gone from the package to allow update
+Provides:       libsvn_auth_kwallet-1-0 = %{version}
+Obsoletes:      libsvn_auth_kwallet-1-0 < %{version}
 %{?systemd_requires}
 %if %{with all_regression_tests}
 # tools required for network based tests
@@ -118,15 +113,6 @@ BuildRequires:  wget
 %if %{with python_ctypes}
 BuildRequires:  ctypesgen
 %endif
-%if %{with_kde}
-BuildRequires:  kdelibs4-core
-BuildRequires:  libkde4-devel
-%else
-# In a case we migrate from system that had the kwallet integration we need it
-# gone from the package to allow update
-Provides:       libsvn_auth_kwallet-1-0 = %{version}
-Obsoletes:      libsvn_auth_kwallet-1-0 < %{version}
-%endif
 
 %description
 Subversion exists to be universally recognized and adopted as an open-source,
@@ -200,16 +186,6 @@ Requires:       subversion = %{version}
 The subversion-server package adds the Subversion server Apache module
 to the Apache directories and configuration.
 
-%package -n libsvn_auth_kwallet-1-0
-Summary:        KWallet support for Subversion
-Group:          Development/Tools/Version Control
-Requires:       %{name} = %{version}
-Supplements:    packageand(subversion:kdebase4-workspace)
-Supplements:    packageand(subversion:plasma5-workspace)
-
-%description -n libsvn_auth_kwallet-1-0
-Provides KWallet integration for Subversion
-
 %package -n libsvn_auth_gnome_keyring-1-0
 Summary:        GNOME keyring sypport for Subversion
 Group:          Development/Tools/Version Control
@@ -294,9 +270,6 @@ 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 \
@@ -438,11 +411,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
 %post -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
 %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
 %license LICENSE
 %doc README.SUSE BUGS CHANGES README.mod_authz_svn
@@ -534,12 +502,6 @@ 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
-%{_libdir}/libsvn_auth_kwallet-1.so.0
-%{_libdir}/libsvn_auth_kwallet-1.so.0.*
-%endif
-
 %files bash-completion
 %config %{_sysconfdir}/bash_completion.d/%{name}