- support for apr 1.0.0

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index be2129d50796c1879d730c75989b5de5472e1a50..a615c6ab9a0592577457014a45b5a0bf92f9f200 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -15,19 +15,17 @@ 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
-%define        _rc     rc3
 Version:       1.1.0
-Release:       0.%{_rc}.1
+Release:       0.1
 License:       Apache/BSD Style
 Group:         Development/Version Control
-Source0:       http://subversion.tigris.org/tarballs/%{name}-%{version}-%{_rc}.tar.bz2
-# Source0-md5: 9612af0f7f38963884776337b4c8d023
+Source0:       http://subversion.tigris.org/tarballs/%{name}-%{version}.tar.bz2
+# Source0-md5: a91b0d79b8c8ab8747587037c044c6c9
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
 Source4:       %{name}-svnserve.sysconfig
-#Patch0:               %{name}-svnlook.patch
-#Patch1:               %{name}-hot_backup_num.patch
+Patch0:                %{name}-log-xml.patch
 URL:           http://subversion.tigris.org/
 %if %{with net_client_only}
 %global apache_modules_api 0
@@ -46,8 +44,8 @@ BuildRequires:        perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
 %endif
 %endif
-BuildRequires: apr-devel >= 1:0.9.5
-BuildRequires: apr-util-devel >= 1:0.9.5
+BuildRequires: apr-devel >= 1:1.0.0
+BuildRequires: apr-util-devel >= 1:1.0.0
 BuildRequires: autoconf >= 2.59
 BuildRequires: bison
 BuildRequires: docbook-style-xsl >= 1.56
@@ -268,9 +266,8 @@ Apache module: Subversion Server - path-based authorization.
 Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_rc}
-#%patch0 -p0
-#%patch1 -p1
+%setup -q
+%patch0 -p0
 
 rm -rf apr-util{,/xml/expat}/autom4te.cache
 
@@ -304,8 +301,8 @@ chmod +x ./autogen.sh && ./autogen.sh
 %endif
 %endif
        %{!?with_internal_neon:--with-neon=%{_prefix}} \
-       --with-apr=%{_bindir}/apr-config \
-       --with-apr-util=%{_bindir}/apu-config
+       --with-apr=%{_bindir}/apr-1-config \
+       --with-apr-util=%{_bindir}/apu-1-config
 
 %{__make}