- typo in version

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 21655460746b810d9a019ed855b2ddce0967207c..56beaab01cc0f426f4c3b0b05ac60471ff6d745a 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,31 +1,31 @@
 %include        /usr/lib/rpm/macros.python
-%define requires_eq_to()  %(LC_ALL="C" echo '%2' | xargs -r rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
-%define        repov 5110
+%define        repov 5322
 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.25
+Version:       0.26.0
 Release:       0.1
 License:       Apache/BSD Style
 Group:         Development/Version Control
 #Source0Download:      http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260
 Source0:       http://subversion.tigris.org/files/documents/15/%{repov}/subversion-%{version}.tar.gz
-# Source0-md5: a018220d5c790161bc712ccb7d0f1b38
+# Source0-md5: 700caa3f59b585d173812c4a078feeba
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 URL:           http://subversion.tigris.org/
-BuildRequires: apache-devel >= 2.0.47
-BuildRequires: apr-devel >= 2.0.46-0.2
+BuildRequires: apache-devel >= 2.0.47-0.2
+BuildRequires: apr-devel >= 2.0.47-0.2
 BuildRequires: autoconf >= 2.53
 BuildRequires: bison
 BuildRequires: db-devel >= 4.1.25
 BuildRequires: docbook-style-xsl >= 1.60.1
 BuildRequires: expat-devel
 BuildRequires: libtool >= 1.4-9
-BuildRequires: neon-devel >= 0.23.4
+BuildRequires: neon-devel >= 0.24.0
 BuildRequires: python >= 2.2
 BuildRequires: rpm-pythonprov >= 4.0.2-50
+BuildRequires: rpmbuild(macros) >= 1.120
 BuildRequires: swig >= 1.3.17
 BuildRequires: swig-python >= 1.3.17
 BuildRequires: texinfo
@@ -147,8 +147,9 @@ M
 Summary:       Apache module: Subversion Server
 Summary(pl):   Modu³ apache: Serwer Subversion
 Group:         Networking/Daemons
-%requires_eq_to        apache apache-devel
-%requires_eq_to        apache-mod_dav apache-devel
+Requires:      apache >= 2.0.47
+Requires:      apache(modules-api) = %{apache_modules_api}
+Requires:      apache-mod_dav
 
 %description -n apache-mod_dav_svn
 Apache module: Subversion Server.
@@ -161,8 +162,8 @@ Summary:    Apache module: Subversion Server - path-based authorization
 Summary(pl):   Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion
 Group:         Networking/Daemons
 Requires:      apache-mod_dav_svn = %{version}
-%requires_eq_to        apache apache-devel
-%requires_eq_to        apache-mod_dav apache-devel
+Requires:      apache >= 2.0.47
+Requires:      apache(modules-api) = %{apache_modules_api}
 
 %description -n apache-mod_authz_svn
 Apache module: Subversion Server - path-based authorization.
@@ -175,6 +176,7 @@ Modu
 
 %build
 chmod +x ./autogen.sh && ./autogen.sh
+
 # don't enable dso - currently it's broken
 %configure \
        --disable-dso \
@@ -203,7 +205,7 @@ cp -f doc/book/book/images/*.png svn-handbook/images/
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir},%{_infodir}}
 
-%{__make} \
+%{__make} LC_ALL=C \
        install \
        install-swig-py \
        DESTDIR=$RPM_BUILD_ROOT \