switch subpackages to lock-step requires on -libs rather than subversion

This commit is contained in:
Joe Orton 2020-05-19 10:52:49 +01:00
parent 15003a7b63
commit 880dc2d088

View File

@ -50,7 +50,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.14.0~rc2 Version: 1.14.0~rc2
Release: 1%{?dist} Release: 2%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: https://subversion.apache.org/ URL: https://subversion.apache.org/
@ -135,7 +135,7 @@ Subversion libraries.
%package devel %package devel
Summary: Development package for the Subversion libraries Summary: Development package for the Subversion libraries
Requires: subversion%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa} Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa}
%description devel %description devel
@ -144,7 +144,7 @@ for developers interacting with the subversion package.
%package gnome %package gnome
Summary: GNOME Keyring support for Subversion Summary: GNOME Keyring support for Subversion
Requires: subversion%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
BuildRequires: dbus-devel, libsecret-devel BuildRequires: dbus-devel, libsecret-devel
%description gnome %description gnome
@ -154,7 +154,7 @@ passwords in the GNOME Keyring.
%if %{with kwallet} %if %{with kwallet}
%package kde %package kde
Summary: KDE Wallet support for Subversion Summary: KDE Wallet support for Subversion
Requires: subversion%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
BuildRequires: qt5-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel BuildRequires: qt5-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel
BuildRequires: kf5-kcoreaddons-devel BuildRequires: kf5-kcoreaddons-devel
@ -178,7 +178,7 @@ Summary: Perl bindings to the Subversion libraries
BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker) BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More), perl(ExtUtils::Embed) BuildRequires: perl(Test::More), perl(ExtUtils::Embed)
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
Requires: subversion%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description perl %description perl
This package includes the Perl bindings to the Subversion libraries. This package includes the Perl bindings to the Subversion libraries.
@ -202,7 +202,7 @@ This package includes the JNI bindings to the Subversion libraries.
Summary: Ruby bindings to the Subversion libraries Summary: Ruby bindings to the Subversion libraries
BuildRequires: ruby-devel >= 1.9.1, ruby >= 1.9.1 BuildRequires: ruby-devel >= 1.9.1, ruby >= 1.9.1
BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit)
Requires: subversion%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
Conflicts: ruby-libs%{?_isa} < 1.8.2 Conflicts: ruby-libs%{?_isa} < 1.8.2
%description ruby %description ruby
@ -210,7 +210,7 @@ This package includes the Ruby bindings to the Subversion libraries.
%package tools %package tools
Summary: Supplementary tools for Subversion Summary: Supplementary tools for Subversion
Requires: subversion%{?_isa} = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description tools %description tools
This package includes supplementary tools for use with Subversion. This package includes supplementary tools for use with Subversion.
@ -541,6 +541,9 @@ make check-javahl
%endif %endif
%changelog %changelog
* Tue May 19 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-2
- switch subpackages to lock-step requires on -libs rather than subversion
* Thu Apr 30 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-1 * Thu Apr 30 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-1
- drop Berkeley DB support for Fedora > 32 - drop Berkeley DB support for Fedora > 32
- BR java-11-openjdk-devel - BR java-11-openjdk-devel