SPECS: subversion.spec - prepare for final 1.5.0 (rc4 for now); ru...

[arekm]

Author: arekm                        Date: Wed Apr 23 17:45:08 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- prepare for final 1.5.0 (rc4 for now); run test suite when building

---- Files affected:
SPECS:
   subversion.spec (1.205 -> 1.206) 

---- Diffs:

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.205 SPECS/subversion.spec:1.206
--- SPECS/subversion.spec:1.205	Thu Feb 21 22:00:03 2008
+++ SPECS/subversion.spec	Wed Apr 23 19:45:02 2008
@@ -8,21 +8,25 @@
 %bcond_without	python				# build without python bindings (broken)
 %bcond_without	perl				# build without perl bindings
 %bcond_without	apache				# build without apache support (webdav, etc)
+%bcond_without	tests
 #
 %{!?with_net_client_only:%include	/usr/lib/rpm/macros.perl}
 %define	apxs	/usr/sbin/apxs
 %define	pdir	SVN
 %define	pnam	_Core
+#
+%define	snap	rc4
 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.4.6
-Release:	4
+Version:	1.5.0
+Release:	0.%{snap}.1
 License:	Apache/BSD-like
 Group:		Development/Version Control
-Source0:	http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	32786fe2f322982c0567346de18f6460
+# Source0:	http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://orac.ece.utexas.edu/pub/svn/%{version}-%{snap}/leander-hackberry/%{name}-%{version}-%{snap}.tar.gz
+# Source0-md5:	905fc5030be179d4d387803b8397668a
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -30,9 +34,6 @@
 Source5:	%{name}-convert-typemaps-to-ifdef.py
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-DESTDIR.patch
-Patch2:		%{name}-neon.patch
-Patch3:		%{name}-python_bindings.patch
-Patch4:		%{name}-swig.patch
 URL:		http://subversion.tigris.org/
 %if %{with net_client_only}
 %global apache_modules_api 0
@@ -51,6 +52,7 @@
 BuildRequires:	apr-util-devel >= 1:1.2.8-3
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	bison
+BuildRequires:	cyrus-sasl-devel
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
 BuildRequires:	libtool >= 1.4-9
@@ -270,13 +272,10 @@
 Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{snap}
 rm -rf apr apr-util neon
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 rm subversion/bindings/swig/proxy/*.swg 
@@ -287,7 +286,7 @@
 # don't enable dso - currently it's broken
 %configure \
 	--with-editor=vi \
-	--with-zlib \
+	--with-zlib=%{_libdir} \
 	--with-python=%{_bindir}/python \
 	--with-perl5=%{_bindir}/perl \
 %if %{with net_client_only}
@@ -334,6 +333,10 @@
 %endif
 %endif
 
+%if %{with tests}
+%{__make} check
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
@@ -522,6 +525,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2008-04-23 17:45:02  arekm
+- prepare for final 1.5.0 (rc4 for now); run test suite when building
+
 Revision 1.205  2008-02-21 21:00:03  hawk
 - release 4
 
================================================================

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