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

Accepting request 124760 from home:AndreasStieger:branches:devel:tools:scm:svn

Browse Source 
- make build against neon optional, default on, like serf
  
  mainly due to discussion on svn-dev ml about possible
  removal of ra_neon for 1.8.0

OBS-URL: https://build.opensuse.org/request/show/124760
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=100
This commit is contained in:
Dirk Mueller 2012-06-15 15:17:53 +00:00 committed by Git OBS Bridge
parent a4350a867e
commit e78c6f5b83
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subversion.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 12 20:02:22 UTC 2012 - andreas.stieger@gmx.de
- make build against neon optional, default on, like serf
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 7 17:08:01 UTC 2012 - andreas.stieger@gmx.de Thu Jun 7 17:08:01 UTC 2012 - andreas.stieger@gmx.de

17
subversion.spec
View File

@ -33,6 +33,7 @@
%define with_kde4_kwallet 0%{?suse_version} > 1100 %define with_kde4_kwallet 0%{?suse_version} > 1100
%define with_gnome_keyring 0%{?suse_version} > 1100 %define with_gnome_keyring 0%{?suse_version} > 1100
%bcond_without neon
%bcond_without serf %bcond_without serf
# run build --with=regression_tests to run test suite # run build --with=regression_tests to run test suite
@ -98,12 +99,14 @@ BuildRequires: junit
%else %else
%define with_java 0 %define with_java 0
%endif %endif
%if %{with neon}
%if 0%{?suse_version} > 1030 %if 0%{?suse_version} > 1030
BuildRequires: libneon-devel BuildRequires: libneon-devel
%else %else
BuildRequires: neon-devel BuildRequires: neon-devel
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
%endif # suse_version > 1030 %endif # suse_version > 1030
%endif # with neon
%if %{with regression_tests} %if %{with regression_tests}
# for check section, to find a free port: # for check section, to find a free port:
BuildRequires: iproute2 BuildRequires: iproute2
@ -459,7 +462,9 @@ export LDFLAGS=-pie
export PATH="${SWIG_ROOT}/bin:${PATH}" export PATH="${SWIG_ROOT}/bin:${PATH}"
%configure \ %configure \
--with-editor="vim -c 'set tw=72 et' " \ --with-editor="vim -c 'set tw=72 et' " \
%if %{with neon}
--with-neon=%{_prefix} \ --with-neon=%{_prefix} \
%endif
%if %{with serf} %if %{with serf}
--with-serf=%{_prefix} \ --with-serf=%{_prefix} \
%endif %endif
@ -583,6 +588,7 @@ rm -f %{buildroot}/var/adm/perl-modules/subversion
# #
# double check that the essential repository access schemes have been compiled in # double check that the essential repository access schemes have been compiled in
# requires at least one http library: neon or serf
# #
schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2 | sort -u) 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: '
@ -591,6 +597,17 @@ http
https https
svn" svn"
# #
%if %{with neon}
#
# double check that when building with neon support, ra_neon is actually available and handles http and https schemes
#
serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_neon" | %__grep "'" | cut -d\' -f2 )
# reset vim syntax: '
test "$serf_schemes" = "http
https"
#
%endif # with neon
#
%if %{with serf} %if %{with serf}
# #
# double check that when building with serf support, ra_serf is actually available and handles http and https schemes # double check that when building with serf support, ra_serf is actually available and handles http and https schemes