- _apachelibdir fixed

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 4943fa1489d610a3082acf0fb3b310e529a28ef1..ac36ed52e9c95fa8a4701a9130d0f7015d6e2764 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -12,28 +12,29 @@ 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.34.0
+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: 52f3a73858566d4d7045e449d94390e3
+# 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
-Patch1:                %{name}-svnlook.patch
+Patch0:                %{name}-svnlook.patch
+Patch1:                %{name}-bindings.patch
 URL:           http://subversion.tigris.org/
 %if %{with net_client_only}
 %global apache_modules_api 0
 %else
+BuildRequires: automake
 BuildRequires: apache-devel >= 2.0.47-0.6
 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: swig = 1.3.19
+BuildRequires: swig-python = 1.3.19
+BuildRequires: swig-perl = 1.3.19
 BuildRequires: perl-devel >= 5.8.0
 BuildRequires: rpm-perlprov
 %endif
@@ -51,7 +52,7 @@ BuildRequires:        rpm-pythonprov >= 4.0.2-50
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _apachelibdir   /usr/lib/apache
+%define                _apachelibdir   /usr/%{_lib}/apache
 %define                _libexecdir     %{_libdir}/svn
 
 %description
@@ -234,10 +235,11 @@ Modu
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
+%patch1 -p1
 
 %build
+cp -f /usr/share/automake/config.sub ac-helpers
 chmod +x ./autogen.sh && ./autogen.sh
 
 # don't enable dso - currently it's broken
@@ -272,6 +274,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}