From 9362374114e5f7acd33e42730e9bdf35350717ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Dec 17 2020 11:11:56 +0000 Subject: drop unneeded conflicts to allow installation of php-phpseclib3 --- diff --git a/php-google-auth.spec b/php-google-auth.spec index ee646d7..ab443c7 100644 --- a/php-google-auth.spec +++ b/php-google-auth.spec @@ -49,7 +49,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: Google Auth Library for PHP License: ASL 2.0 @@ -131,8 +131,6 @@ Requires: php-composer(fedora/autoloader) # Weak dependencies ## composer.json: optional Suggests: php-composer(phpseclib/phpseclib) -Conflicts: php-composer(phpseclib/phpseclib) < 2 -Conflicts: php-composer(phpseclib/phpseclib) >= 3 # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -223,6 +221,9 @@ exit $RETURN_CODE %changelog +* Thu Dec 17 2020 Remi Collet - 1.5.1-5 +- drop unneeded conflicts to allow installation of php-phpseclib3 + * Tue Jul 28 2020 Fedora Release Engineering - 1.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild