Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at 2012-06-18 14:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2012-06-12 07:16:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2012-06-18 14:54:13.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 12 20:02:22 UTC 2012 - [email protected] + +- make build against neon optional, default on, like serf + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.mCejrs/_old 2012-06-18 14:54:16.000000000 +0200 +++ /var/tmp/diff_new_pack.mCejrs/_new 2012-06-18 14:54:16.000000000 +0200 @@ -33,6 +33,7 @@ %define with_kde4_kwallet 0%{?suse_version} > 1100 %define with_gnome_keyring 0%{?suse_version} > 1100 +%bcond_without neon %bcond_without serf # run build --with=regression_tests to run test suite @@ -98,12 +99,14 @@ %else %define with_java 0 %endif +%if %{with neon} %if 0%{?suse_version} > 1030 BuildRequires: libneon-devel %else BuildRequires: neon-devel BuildRequires: openldap2-devel %endif # suse_version > 1030 +%endif # with neon %if %{with regression_tests} # for check section, to find a free port: BuildRequires: iproute2 @@ -459,7 +462,9 @@ export PATH="${SWIG_ROOT}/bin:${PATH}" %configure \ --with-editor="vim -c 'set tw=72 et' " \ +%if %{with neon} --with-neon=%{_prefix} \ +%endif %if %{with serf} --with-serf=%{_prefix} \ %endif @@ -583,6 +588,7 @@ # # 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) # reset vim syntax: ' @@ -591,6 +597,17 @@ https 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} # # double check that when building with serf support, ra_serf is actually available and handles http and https schemes -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
