From 91270f3dd4f1d647b3e2002085b4465d2c1f5a984a3e99409bce7b0dbe70deba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Apr 2018 08:20:11 +0000 Subject: [PATCH] - Reenable kwallet integration as kdelibs4 were ported to the openssl-1.1 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=262 --- subversion.changes | 6 ++++++ subversion.spec | 18 +++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/subversion.changes b/subversion.changes index eeb42e3..f7d8c89 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/subversion.spec b/subversion.spec index 96d3e70..0416794 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,7 +1,7 @@ # # spec file for package subversion # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Andreas Stieger # Copyright (c) 2009-2010 Pascal Bleser # @@ -27,13 +27,7 @@ %if 0%{?is_opensuse} != 1 %define with_kde 0 %else - # Disable kwallet support on Tumbleweed, because otherwise there will be - # a conflict between libopenssl-devel versions pulled in by libserf and libqt4 - %if 0%{?suse_version} >= 1330 - %define with_kde 0 - %else - %define with_kde 1 - %endif +%define with_kde 1 %endif #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} @@ -47,7 +41,7 @@ Release: 0 Summary: Subversion version control system License: Apache-2.0 Group: Development/Tools/Version Control -Url: https://subversion.apache.org +URL: https://subversion.apache.org Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2 Source1: subversion.conf Source2: subversion.README.SUSE @@ -143,7 +137,6 @@ to large-scale enterprise operations. %package devel Summary: Development package for Subversion developers -# this pulls in libapr1-devel and libexpat-devel Group: Development/Libraries/C and C++ Requires: libapr-util1-devel Requires: subversion = %{version} @@ -207,7 +200,6 @@ 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: KWallet support for Subversion Group: Development/Tools/Version Control @@ -217,7 +209,6 @@ Supplements: packageand(subversion:plasma5-workspace) %description -n libsvn_auth_kwallet-1-0 Provides KWallet integration for Subversion -%endif %package -n libsvn_auth_gnome_keyring-1-0 Summary: GNOME keyring sypport for Subversion @@ -455,7 +446,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf %endif %files -f files.subversion -%doc README.SUSE BUGS CHANGES LICENSE README.mod_authz_svn +%license LICENSE +%doc README.SUSE BUGS CHANGES README.mod_authz_svn %dir %{_docdir}/%{name}/* %{_docdir}/%{name} %{_sbindir}/rcsvnserve