SPECS: subversion.spec - rel 2; switch to (finished) serf

[arekm]

Author: arekm                        Date: Sun Aug 10 10:28:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; switch to (finished) serf

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

---- Diffs:

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.226 SPECS/subversion.spec:1.227
--- SPECS/subversion.spec:1.226	Fri Aug  8 22:32:11 2008
+++ SPECS/subversion.spec	Sun Aug 10 12:28:36 2008
@@ -6,7 +6,7 @@
 #
 # Conditional build:
 %bcond_with	net_client_only		# build only net client
-%bcond_with	serf			# use serf instead of neon
+%bcond_without	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
@@ -23,12 +23,18 @@
 %define	pdir	SVN
 %define	pnam	_Core
 #
+%if %{with serf}
+%define	webdavlib	serf
+%else
+%define	webdavlib	neon
+%endif
+#
 Summary:	A Concurrent Versioning system similar to but better than CVS
 Summary(pl.UTF-8):	System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):	Sistema de versionamento concorrente
 Name:		subversion
 Version:	1.5.1
-Release:	1
+Release:	2
 License:	Apache/BSD-like
 Group:		Development/Version Control
 Source0:	http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2
@@ -37,10 +43,14 @@
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
 Source4:	%{name}-svnserve.sysconfig
+# current subversion tarball has correct *.swg files
+# but after regeneration these are broken again, so
+# we still need this script
 Source5:	%{name}-convert-typemaps-to-ifdef.py
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-ruby-datadir-path.patch
+Patch3:		%{name}-tests.patch
 URL:		http://subversion.tigris.org/
 %if %{with net_client_only}
 %global apache_modules_api 0
@@ -337,6 +347,12 @@
 %patch0 -p0
 %patch1 -p1
 %patch2 -p0
+%patch3 -p0
+
+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}
 
 %build
 rm subversion/bindings/swig/proxy/*.swg
@@ -565,8 +581,8 @@
 %attr(755,root,root) %ghost %{_libdir}/libsvn_ra-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_ra_local-1.so.0
-%attr(755,root,root) %{_libdir}/libsvn_ra_neon-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsvn_ra_neon-1.so.0
+%attr(755,root,root) %{_libdir}/libsvn_ra_%{webdavlib}-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsvn_ra_%{webdavlib}-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_ra_svn-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_ra_svn-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_repos-1.so.*.*.*
@@ -587,7 +603,7 @@
 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so
-%attr(755,root,root) %{_libdir}/libsvn_ra_neon-1.so
+%attr(755,root,root) %{_libdir}/libsvn_ra_%{webdavlib}-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra_svn-1.so
 %attr(755,root,root) %{_libdir}/libsvn_repos-1.so
 %attr(755,root,root) %{_libdir}/libsvn_subr-1.so
@@ -601,7 +617,7 @@
 %{_libdir}/libsvn_fs_util-1.la
 %{_libdir}/libsvn_ra-1.la
 %{_libdir}/libsvn_ra_local-1.la
-%{_libdir}/libsvn_ra_neon-1.la
+%{_libdir}/libsvn_ra_%{webdavlib}-1.la
 %{_libdir}/libsvn_ra_svn-1.la
 %{_libdir}/libsvn_repos-1.la
 %{_libdir}/libsvn_subr-1.la
@@ -620,7 +636,7 @@
 %{_libdir}/libsvn_fs_util-1.a
 %{_libdir}/libsvn_ra-1.a
 %{_libdir}/libsvn_ra_local-1.a
-%{_libdir}/libsvn_ra_neon-1.a
+%{_libdir}/libsvn_ra_%{webdavlib}-1.a
 %{_libdir}/libsvn_ra_svn-1.a
 %{_libdir}/libsvn_repos-1.a
 %{_libdir}/libsvn_subr-1.a
@@ -724,6 +740,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.227  2008/08/10 10:28:36  arekm
+- rel 2; switch to (finished) serf
+
 Revision 1.226  2008/08/08 20:32:11  arekm
 - partial libserf support (we will switch to it from neon in future)
 
================================================================

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