- updated to 0.35.1

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 8ddd2b6dd724eac7619f14b5d3546fbc3297862d..2eb38290808c4121a59cf71d1d7907bb9271ca41 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -12,17 +12,18 @@ Summary:    A Concurrent Versioning system similar to but better than CVS
 Summary(pl):   System kontroli wersji podobny, ale lepszy, ni¿ CVS
 Summary(pt_BR):        Sistema de versionamento concorrente
 Name:          subversion
-Version:       0.33.1
-Release:       4
+Version:       0.35.1
+Release:       1
 License:       Apache/BSD Style
 Group:         Development/Version Control
 Source0:       http://svn.collab.net/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5: 2d45e838243cb0bc71c80582d089be15
+# Source0-md5: c4473988acdd82e8b0e176eefc7d0fb7
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
 Source4:       %{name}-svnserve.sysconfig
-Patch0:                %{name}-perl.patch
+Patch0:                %{name}-svnlook.patch
+Patch1:                %{name}-bindings.patch
 URL:           http://subversion.tigris.org/
 %if %{with net_client_only}
 %global apache_modules_api 0
@@ -32,12 +33,13 @@ BuildRequires:      db-devel >= 4.1.25
 BuildRequires: rpmbuild(macros) >= 1.120
 BuildRequires: swig >= 1.3.17
 BuildRequires: swig-python >= 1.3.17
+BuildRequires: swig-perl >= 1.3.17
 BuildRequires: perl-devel >= 5.8.0
 BuildRequires: rpm-perlprov
 %endif
 BuildRequires: apr-devel >= 1:0.9.5
 BuildRequires: apr-util-devel >= 1:0.9.5
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.59
 BuildRequires: bison
 BuildRequires: docbook-style-xsl >= 1.56
 BuildRequires: expat-devel
@@ -232,7 +234,8 @@ Modu
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
+%patch1 -p1
 
 %build
 chmod +x ./autogen.sh && ./autogen.sh
@@ -269,6 +272,7 @@ bdir=$(pwd)
 %{__make}
 cd subversion/bindings/swig/perl
 env APR_CONFIG=%{_bindir}/apr-config \
+    APU_CONFIG=%{_bindir}/apu-config \
        %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
 env LIBRARY_PATH=${bdir}/swig-pl-lib-buildroot%{_libdir} %{__make}
@@ -278,8 +282,8 @@ cd ../../../../
 # build documentation; build process for documentation is severely
 # braindamaged -- authors suggests to untar docbook distribution in
 # build directory, hence the hack here
-%{__make} -C doc/book all-html \
-       XSL_DIR=/usr/share/sgml/docbook/xsl-stylesheets/
+ln -s /usr/share/sgml/docbook/xsl-stylesheets doc/book/tools/xsl
+%{__make} -C doc/book all-html
 
 # prepare for %%doc below
 mv -f doc/book/book/html-chunk svn-handbook
@@ -382,7 +386,6 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/%{name}*
-#%attr(755,root,root) %{_bindir}/svn-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_infodir}/svn*