Author: arekm Date: Fri Aug 8 20:32:17 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- partial libserf support (we will switch to it from neon in future)
---- Files affected:
SPECS:
subversion.spec (1.225 -> 1.226)
---- Diffs:
================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.225 SPECS/subversion.spec:1.226
--- SPECS/subversion.spec:1.225 Mon Aug 4 11:51:35 2008
+++ SPECS/subversion.spec Fri Aug 8 22:32:11 2008
@@ -6,6 +6,7 @@
#
# Conditional build:
%bcond_with net_client_only # build only net client
+%bcond_with serf # use serf instead of neon
%bcond_without python # build without python bindings (broken)
%bcond_without perl # build without perl bindings
%bcond_without ruby # build without ruby bindings
@@ -63,7 +64,11 @@
BuildRequires: expat-devel
BuildRequires: gettext-devel
BuildRequires: libtool >= 1.4-9
+%if %{with serf}
+BuildRequires: serf-devel
+%else
BuildRequires: neon-devel >= 0.26.0
+%endif
BuildRequires: python >= 2.2
BuildRequires: python-modules >= 2.2
%if %{with python}
@@ -128,7 +133,7 @@
Summary: Subversion libraries and modules
Summary(pl.UTF-8): Biblioteka subversion oraz ładowalne moduły
Group: Libraries
-Requires: neon >= 0.26.0
+%{!?with_serf:Requires: neon >= 0.26.0}
Obsoletes: libsubversion0
%description libs
@@ -144,7 +149,7 @@
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: apr-util-devel >= 1:1.0.0
-Requires: neon-devel >= 0.26.0
+%{!?with_serf:Requires: neon-devel >= 0.26.0}
Obsoletes: libsubversion0-devel
%description devel
@@ -363,8 +368,14 @@
--%{?with_javahl:en}%{!?with_javahl:dis}able-javahl \
%endif
--with-jdk="%{java_home}" \
+%if %{with serf}
+ --with-serf=%{_prefix} \
+ --without-neon \
+%else
+ --without-serf \
--with-neon=%{_prefix} \
--disable-neon-version-check \
+%endif
--with-apr=%{_bindir}/apr-1-config \
--with-apr-util=%{_bindir}/apu-1-config
@@ -713,6 +724,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.226 2008/08/08 20:32:11 arekm
+- partial libserf support (we will switch to it from neon in future)
+
Revision 1.225 2008/08/04 09:51:35 sls
- BR: ruby-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/subversion.spec?r1=1.225&r2=1.226&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
