- svn-hot-backup if !with_net_client_only

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index a4a85ad56222c717e3b50a96920dc8312a4355b6..8ab0457be57b230eb7be728073aec7cc6e5f8eb6 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -10,22 +10,24 @@
 %bcond_without apache                          # build without apache support (webdav, etc)
 #
 %{!?with_net_client_only:%include      /usr/lib/rpm/macros.perl}
+%define        apxs    /usr/sbin/apxs
 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:       1.3.0
-Release:       4.1
+Version:       1.3.2
+Release:       1
 License:       Apache/BSD Style
 Group:         Development/Version Control
 Source0:       http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 0d91a7fe152d0373044c47c54deb2c9a
+# Source0-md5: f790c49c219b4196e37ebfa71ab797d5
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
 Source4:       %{name}-svnserve.sysconfig
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-DESTDIR.patch
+Patch2:                %{name}-neon.patch
 URL:           http://subversion.tigris.org/
 %if %{with net_client_only}
 %global apache_modules_api 0
@@ -47,7 +49,7 @@ BuildRequires:        bison
 BuildRequires: expat-devel
 BuildRequires: gettext-devel
 BuildRequires: libtool >= 1.4-9
-BuildRequires: neon-devel >= 0.24.7
+BuildRequires: neon-devel >= 0.26.0
 %if %{with python}
 BuildRequires: python >= 2.2
 BuildRequires: python-devel >= 2.2
@@ -60,8 +62,8 @@ BuildRequires:        which
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _apachelibdir   /usr/%{_lib}/apache
-%define                _libexecdir     %{_libdir}/svn
+%define                _apachelibdir   %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _libexecdir             %{_libdir}/svn
 
 %description
 The goal of the Subversion project is to build a version control
@@ -266,6 +268,7 @@ Modu
 rm -rf apr apr-util neon
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub ac-helpers
@@ -297,6 +300,7 @@ chmod +x ./autogen.sh && ./autogen.sh
 %endif
 %endif
        --with-neon=%{_prefix} \
+       --disable-neon-version-check \
        --with-apr=%{_bindir}/apr-1-config \
        --with-apr-util=%{_bindir}/apu-1-config
 
@@ -416,7 +420,9 @@ fi
 %attr(755,root,root) %{_bindir}/svn*
 %exclude %{_bindir}/svnserve
 %exclude %{_bindir}/svn-config
+%if %{without net_client_only}
 %exclude %{_bindir}/svn-hot-backup
+%endif
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*