From cc7a99e40e5c2774d3bf8326ca588c093a40480d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 4 Mar 2011 14:33:47 +0000 Subject: [PATCH] update to 1.6.16 (#682203) tweak arch-specific requires --- .gitignore | 2 +- sources | 2 +- subversion.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f8d26d2..9411836 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ subversion-1.6.12.tar.bz2 /subversion-1.6.13.tar.bz2 /subversion-1.6.15.tar.bz2 /subversion-1.6.15 -/clog \ No newline at end of file +/clog/subversion-1.6.16.tar.bz2 diff --git a/sources b/sources index efcdfa1..eb8ec31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -113fca1d9e4aa389d7dc2b210010fa69 subversion-1.6.15.tar.bz2 +32f25a6724559fe8691d1f57a63f636e subversion-1.6.16.tar.bz2 diff --git a/subversion.spec b/subversion.spec index f3451fd..77fd047 100644 --- a/subversion.spec +++ b/subversion.spec @@ -16,7 +16,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.6.15 +Version: 1.6.16 Release: 1%{?dist} License: ASL 1.1 Group: Development/Tools @@ -45,6 +45,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: svn = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service +Requires: subversion-libs%{?_isa} = %{version}-%{release} %define __perl_requires %{SOURCE3} @@ -62,7 +63,6 @@ compelling replacement for CVS. %package libs Group: Development/Tools Summary: Libraries for Subversion Version Control system -Requires: subversion = %{version}-%{release} # APR 1.3.x interfaces are required Conflicts: apr%{?_isa}< 1.3.0 @@ -102,7 +102,7 @@ passwords in the KDE Wallet. Group: System Environment/Daemons Summary: Apache httpd module for Subversion server Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing) -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} BuildRequires: httpd-devel >= 2.0.45 %description -n mod_dav_svn @@ -430,6 +430,10 @@ fi %{_mandir}/man1/svn2cl.1* %changelog +* Fri Mar 4 2011 Joe Orton - 1.6.16-1 +- update to 1.6.16 (#682203) +- tweak arch-specific requires + * Sun Nov 28 2010 Joe Orton - 1.6.15-1 - update to 1.6.15