SPECS: subversion.spec - bcond change: without_serf -> with_neon

[adamg]

Author: adamg                        Date: Sun Aug 10 10:48:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond change: without_serf -> with_neon

---- Files affected:
SPECS:
   subversion.spec (1.227 -> 1.228) 

---- Diffs:

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.227 SPECS/subversion.spec:1.228
--- SPECS/subversion.spec:1.227	Sun Aug 10 12:28:36 2008
+++ SPECS/subversion.spec	Sun Aug 10 12:48:51 2008
@@ -6,7 +6,7 @@
 #
 # Conditional build:
 %bcond_with	net_client_only		# build only net client
-%bcond_without	serf			# use serf instead of neon
+%bcond_with	neon			# use neon instead of serf
 %bcond_without	python			# build without python bindings (broken)
 %bcond_without	perl			# build without perl bindings
 %bcond_without	ruby			# build without ruby bindings
@@ -23,10 +23,10 @@
 %define	pdir	SVN
 %define	pnam	_Core
 #
-%if %{with serf}
-%define	webdavlib	serf
-%else
+%if %{with neon}
 %define	webdavlib	neon
+%else
+%define	webdavlib	serf
 %endif
 #
 Summary:	A Concurrent Versioning system similar to but better than CVS
@@ -74,7 +74,7 @@
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
 BuildRequires:	libtool >= 1.4-9
-%if %{with serf}
+%if %{without neon}
 BuildRequires:	serf-devel
 %else
 BuildRequires:	neon-devel >= 0.26.0
@@ -143,7 +143,7 @@
 Summary:	Subversion libraries and modules
 Summary(pl.UTF-8):	Biblioteka subversion oraz ładowalne moduły
 Group:		Libraries
-%{!?with_serf:Requires:	neon >= 0.26.0}
+%{?with_neon:Requires:	neon >= 0.26.0}
 Obsoletes:	libsubversion0
 
 %description libs
@@ -159,7 +159,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	apr-util-devel >= 1:1.0.0
-%{!?with_serf:Requires:	neon-devel >= 0.26.0}
+%{?with_neon:Requires:	neon-devel >= 0.26.0}
 Obsoletes:	libsubversion0-devel
 
 %description devel
@@ -352,7 +352,7 @@
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4
 
 # serf.m4 macro is broken and ignores --without serf
-%{!?with_serf:sed -i -e 's#serf_found="yes"#serf_found="no"#g' build/ac-macros/serf.m4}
+%{?with_neon:sed -i -e 's#serf_found="yes"#serf_found="no"#g' build/ac-macros/serf.m4}
 
 %build
 rm subversion/bindings/swig/proxy/*.swg
@@ -384,13 +384,13 @@
 	--%{?with_javahl:en}%{!?with_javahl:dis}able-javahl \
 %endif
 	--with-jdk="%{java_home}" \
-%if %{with serf}
-	--with-serf=%{_prefix} \
-	--without-neon \
-%else
+%if %{with neon}
 	--without-serf \
 	--with-neon=%{_prefix} \
 	--disable-neon-version-check \
+%else
+	--with-serf=%{_prefix} \
+	--without-neon \
 %endif
 	--with-apr=%{_bindir}/apr-1-config \
 	--with-apr-util=%{_bindir}/apu-1-config
@@ -740,6 +740,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228  2008/08/10 10:48:51  adamg
+- bcond change: without_serf -> with_neon
+
 Revision 1.227  2008/08/10 10:28:36  arekm
 - rel 2; switch to (finished) serf
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/subversion.spec?r1=1.227&r2=1.228&f=u