- no ruby-devel on x32

[packages/subversion.git] / subversion.spec

diff --git a/subversion.spec b/subversion.spec
index 403b93234ba19df8dce8c5bb9e92c34155b9ed58..6165a066b002f33def27cfd14fcdaf584fd2792d 100644 (file)
--- a/subversion.spec
+++ b/subversion.spec
@@ -16,6 +16,10 @@
 
 # for AC: --without csvn,gnome,java,kde,ruby
 
+%ifarch x32
+%undefine      with_ruby
+%endif
+
 %if %{with net_client_only}
 %undefine      with_apache
 %undefine      with_db
@@ -49,12 +53,12 @@ Summary:    A Concurrent Versioning system similar to but better than CVS
 Summary(pl.UTF-8):     System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):  Sistema de versionamento concorrente
 Name:          subversion
-Version:       1.8.10
+Version:       1.8.11
 Release:       1
 License:       Apache v2.0
 Group:         Development/Version Control
 Source0:       http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5: 3068256761b40863df96128834d6b71b
+# Source0-md5: 766a89bbbb388f8eb76166672d3b9e49
 Source1:       %{name}-dav_svn.conf
 Source2:       %{name}-authz_svn.conf
 Source3:       %{name}-svnserve.init
@@ -79,8 +83,9 @@ BuildRequires:        cyrus-sasl-devel
 BuildRequires: dbus-devel
 %endif
 BuildRequires: db-devel >= 4.1.25
+%{!?with_db6:BuildRequires:    db-devel < 6}
 BuildRequires: expat-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 %{?with_kwallet:BuildRequires: kde4-kdelibs-devel}
 %{?with_gnome:BuildRequires:   libgnome-keyring-devel}
 BuildRequires: libmagic-devel
@@ -576,7 +581,9 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
 # not our package
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/OptionParser
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Time
+%if "%{ruby_version}" >= "2.0"
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/File
+%endif
 %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
 %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid
 %endif
@@ -933,7 +940,6 @@ fi
 %dir %{perl_vendorarch}/auto/SVN
 %dir %{perl_vendorarch}/auto/SVN/*
 %attr(755,root,root) %{perl_vendorarch}/auto/SVN/*/*.so
-%{perl_vendorarch}/auto/SVN/*/*.bs
 %{_mandir}/man3/*.3pm*
 %endif