pool/subversion
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

- add bconditional for libserf support

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=70
This commit is contained in:
Dirk Mueller
2011-08-23 22:34:50 +00:00
committed by Git OBS Bridge
parent ea618ef107
commit 0d5ffec1fc
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
subversion.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 24 00:34:35 CEST 2011 - dmueller@suse.de
- add bconditional for libserf support
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 19 17:39:29 CEST 2011 - dmueller@suse.de Fri Aug 19 17:39:29 CEST 2011 - dmueller@suse.de

13
subversion.spec
View File

@@ -30,6 +30,8 @@
%define with_kde4_kwallet 0%{?suse_version} > 1110 %define with_kde4_kwallet 0%{?suse_version} > 1110
%define with_gnome_keyring 0%{?suse_version} > 1110 %define with_gnome_keyring 0%{?suse_version} > 1110
%bcond_with subversion_libserf_support
Name: subversion Name: subversion
Version: 1.6.17 Version: 1.6.17
Release: 1 Release: 1
@@ -63,6 +65,9 @@ BuildRequires: libgnome-keyring-devel
BuildRequires: gnome-keyring-devel BuildRequires: gnome-keyring-devel
%endif %endif
%endif # with_gnome_keyring %endif # with_gnome_keyring
%if %{with subversion_libserf_support}
BuildRequires: libserf-devel
%endif
%if %with_kde4_kwallet %if %with_kde4_kwallet
BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel
%endif # with_kde4_kwallet %endif # with_kde4_kwallet
@@ -553,12 +558,12 @@ find "%{buildroot}%{py_prefix}/lib/python%{py_ver}/site-packages/csvn/" -name "*
# #
# double check that the essential repository access schemes have been compiled in # double check that the essential repository access schemes have been compiled in
# #
schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2) schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2 | sort -u)
# reset vim syntax: ' # reset vim syntax: '
test "$schemes" = "http test "$schemes" = "file
http
https https
svn svn"
file"
# #
%perl_process_packlist %perl_process_packlist
%find_lang %name %find_lang %name