- remove internal version of %%requires_eq_to (not used now)

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 22ffe56cb385f886d03077f222dc14247012e395..897ce905de30fc427c010bdaffb42662a2f1c992 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,34 +1,34 @@
 %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 4761
+%define        repov 5110
 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.24.1
-Release:       0.2
+Version:       0.25
+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: 8e1402528f0db97d9a187decddde89d1
+# Source0-md5: a018220d5c790161bc712ccb7d0f1b38
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 URL:           http://subversion.tigris.org/
-BuildRequires: apache-devel >= 2.0.46-0.2
-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: 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
-BuildRequires: docbook-style-xsl >= 1.60.1
 Requires(post):        /usr/sbin/fix-info-dir
 Requires(postun):      /usr/sbin/fix-info-dir
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -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.
@@ -158,19 +159,24 @@ Modu
 
 %package -n apache-mod_authz_svn
 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.
 
+%description -n apache-mod_authz_svn -l pl
+Modu³ apache: autoryzacja na podstawie ¶cie¿ki dla serwera Subversion.
+
 %prep
 %setup -q
 
 %build
 chmod +x ./autogen.sh && ./autogen.sh
+
 # don't enable dso - currently it's broken
 %configure \
        --disable-dso \
@@ -213,14 +219,17 @@ install doc/programmer/design/*.info* $RPM_BUILD_ROOT%{_infodir}/
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %post -n apache-mod_dav_svn
 if [ -f /var/lock/subsys/httpd ]; then
@@ -236,9 +245,6 @@ if [ "$1" = "0" ]; then
         fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %doc BUGS CHANGES COPYING IDEAS INSTALL README