[packages/subversion] use %ruby_abi macro
glen
glen at pld-linux.org
Wed Sep 23 10:25:15 CEST 2015
commit b98707c277d5f10f37fc74d6f782867c04c1f477
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Sep 23 11:25:04 2015 +0300
use %ruby_abi macro
subversion.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index ae49407..7d61f76 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -80,8 +80,8 @@ BuildRequires: cyrus-sasl-devel
%if %{with kwallet} || %{with gnome}
BuildRequires: dbus-devel
%endif
-BuildRequires: db-devel >= 4.1.25
%{!?with_db6:BuildRequires: db-devel < 6}
+BuildRequires: db-devel >= 4.1.25
BuildRequires: expat-devel
BuildRequires: gettext-tools
%{?with_gnome:BuildRequires: glib2-devel >= 2.0}
@@ -583,7 +583,7 @@ 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"
+%if "%{ruby_abi}" >= "2.0"
%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/File
%endif
%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/b98707c277d5f10f37fc74d6f782867c04c1f477
More information about the pld-cvs-commit
mailing list