From 47e89b610abac4e0259bad5c06dcf4554fa689ec Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 12 Oct 2010 14:48:57 +0100 Subject: [PATCH 1/4] - trim tools/buildbot, tools/dist from docdir --- subversion.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/subversion.spec b/subversion.spec index 542fbc8..2ea6b34 100644 --- a/subversion.spec +++ b/subversion.spec @@ -17,7 +17,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.6.13 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.apache.org/ @@ -270,7 +270,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a} rm -f ${RPM_BUILD_ROOT}%{ruby_sitearch}/svn/ext/*.*a # Trim what goes in docdir -rm -rf tools/*/*.in tools/test-scripts +rm -rf tools/*/*.in tools/test-scripts tools/buildbot tools/dist # Install psvn for emacs and xemacs for f in emacs/site-lisp xemacs/site-packages/lisp; do @@ -428,6 +428,9 @@ fi %{_mandir}/man1/svn2cl.1* %changelog +* Tue Oct 12 2010 Joe Orton - 1.6.13-2 +- trim tools/buildbot, tools/dist from docdir + * Tue Oct 5 2010 Joe Orton - 1.6.13-1 - update to 1.6.13 From de42b54d8605642ddff4404a9603e2808dba0245 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sun, 28 Nov 2010 14:23:12 +0000 Subject: [PATCH 2/4] - update to 1.6.15 --- subversion.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/subversion.spec b/subversion.spec index 2ea6b34..431720a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -16,8 +16,8 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.6.13 -Release: 2%{?dist} +Version: 1.6.15 +Release: 1%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.apache.org/ @@ -64,7 +64,7 @@ Group: Development/Tools Summary: Libraries for Subversion Version Control system Requires: subversion = %{version}-%{release} # APR 1.3.x interfaces are required -Requires: apr >= 1.3.0 +Conflicts: apr%{?_isa}< 1.3.0 %description libs The subversion-libs package includes the essential shared libraries @@ -73,7 +73,8 @@ used by the Subversion version control tools. %package devel Group: Development/Tools Summary: Development package for the Subversion libraries -Requires: subversion = %{version}-%{release}, apr-devel, apr-util-devel +Requires: subversion%{?_isa} = %{version}-%{release} +Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa} %description devel The subversion-devel package includes the libraries and include files @@ -82,7 +83,7 @@ for developers interacting with the subversion package. %package gnome Group: Development/Tools Summary: GNOME Keyring support for Subversion -Requires: subversion = %{version}-%{release} +Requires: subversion%{?_isa} = %{version}-%{release} %description gnome The subversion-gnome package adds support for storing Subversion @@ -91,7 +92,7 @@ passwords in the GNOME Keyring. %package kde Group: Development/Tools Summary: KDE Wallet support for Subversion -Requires: subversion = %{version}-%{release} +Requires: subversion%{?_isa} = %{version}-%{release} %description kde The subversion-kde package adds support for storing Subversion @@ -101,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 = %{version}-%{release} +Requires: subversion%{?_isa} = %{version}-%{release} BuildRequires: httpd-devel >= 2.0.45 %description -n mod_dav_svn @@ -114,7 +115,7 @@ Summary: Perl bindings to the Subversion libraries BuildRequires: perl-devel >= 2:5.8.0, perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More), perl(ExtUtils::Embed) Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") -Requires: subversion = %{version}-%{release} +Requires: subversion%{?_isa} = %{version}-%{release} %description perl This package includes the Perl bindings to the Subversion libraries. @@ -123,7 +124,7 @@ This package includes the Perl bindings to the Subversion libraries. %package javahl Group: Development/Libraries Summary: JNI bindings to the Subversion libraries -Requires: subversion = %{version}-%{release} +Requires: subversion%{?_isa} = %{version}-%{release} BuildRequires: java-devel-openjdk # JAR repacking requires both zip and unzip in the buildroot BuildRequires: zip, unzip @@ -136,7 +137,8 @@ This package includes the JNI bindings to the Subversion libraries. Group: Development/Libraries Summary: Ruby bindings to the Subversion libraries BuildRequires: ruby-devel >= 1.8.2, ruby >= 1.8.2 -Requires: subversion = %{version}-%{release}, ruby-libs >= 1.8.2 +Requires: subversion%{?_isa} = %{version}-%{release} +Conflicts: ruby-libs%{?_isa} < 1.8.2 Requires: ruby(abi) = 1.8 %description ruby @@ -428,6 +430,12 @@ fi %{_mandir}/man1/svn2cl.1* %changelog +* Sun Nov 28 2010 Joe Orton - 1.6.15-1 +- update to 1.6.15 + +* Sun Oct 17 2010 Ville Skyttä - 1.6.13-3 +- Make name based dependencies arch qualified where appropriate (#643714). + * Tue Oct 12 2010 Joe Orton - 1.6.13-2 - trim tools/buildbot, tools/dist from docdir From 4132eef877313380afcef3040a116f7340d054c1 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sun, 28 Nov 2010 14:41:58 +0000 Subject: [PATCH 3/4] add 1.6.15 sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c5cc234..cce083e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ subversion-1.6.12.tar.bz2 *.rpm /subversion-1.6.13.tar.bz2.asc /subversion-1.6.13.tar.bz2 +/subversion-1.6.15.tar.bz2 diff --git a/sources b/sources index 9544edc..5155fd5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 7ae1c827689f21cf975804005be30aeb subversion-1.6.13.tar.bz2 +113fca1d9e4aa389d7dc2b210010fa69 subversion-1.6.15.tar.bz2 From f31cdf6cf6bb94ff33a262c996a901a6af48fb83 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sun, 28 Nov 2010 14:44:00 +0000 Subject: [PATCH 4/4] remove old sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 5155fd5..efcdfa1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -7ae1c827689f21cf975804005be30aeb subversion-1.6.13.tar.bz2 113fca1d9e4aa389d7dc2b210010fa69 subversion-1.6.15.tar.bz2