summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-google-auth.spec7
1 files changed, 4 insertions, 3 deletions
diff --git a/php-google-auth.spec b/php-google-auth.spec
index a9a2b0f..613bfda 100644
--- a/php-google-auth.spec
+++ b/php-google-auth.spec
@@ -50,7 +50,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 5%{?github_release}%{?dist}
Summary: Google Auth Library for PHP
License: ASL 2.0
@@ -134,8 +134,6 @@ Requires: php-composer(fedora/autoloader)
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Suggests: php-composer(phpseclib/phpseclib)
%endif
-Conflicts: php-composer(phpseclib/phpseclib) < 2
-Conflicts: php-composer(phpseclib/phpseclib) >= 3
# Composer
Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
@@ -227,6 +225,9 @@ exit $RETURN_CODE
%changelog
+* Thu Dec 17 2020 Remi Collet <remi@remirepo.net> - 1.5.1-5
+- drop unneeded conflicts to allow installation of php-phpseclib3
+
* Fri May 24 2019 Shawn Iwinski <shawn@iwin.ski> - 1.5.1-1
- Update to 1.5.1 (RHBZ #1461830)
- Add range version dependencies for Fedora >= 27 || RHEL >= 8