pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Reenable kwallet integration as kdelibs4 were ported to the

Browse Source 
openssl-1.1

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=262
This commit is contained in:
Tomáš Chvátal 2018-04-12 08:20:11 +00:00 committed by Git OBS Bridge
parent 371ec376dc
commit 91270f3dd4
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subversion.changes
View File

@ -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

18
subversion.spec
View File

@ -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 <andreas.stieger@gmx.de>
# Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser@opensuse.org>
#
@ -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