diff options
| -rw-r--r-- | php-composer-installers-pr226.patch | 23 | ||||
| -rw-r--r-- | php-composer-installers.spec | 13 |
2 files changed, 5 insertions, 31 deletions
diff --git a/php-composer-installers-pr226.patch b/php-composer-installers-pr226.patch deleted file mode 100644 index cd80d26..0000000 --- a/php-composer-installers-pr226.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c1507c6d096bf513678fb62aa3e9fa2ad913b6f7 Mon Sep 17 00:00:00 2001 -From: Fabian Vogler <fabian@equivalence.ch> -Date: Wed, 18 Mar 2015 18:22:52 +0100 -Subject: [PATCH] Fix PHPUnit check in CakePHPInstallerTest - -Fix tests on Travis CI ---- - tests/Composer/Installers/Test/CakePHPInstallerTest.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Composer/Installers/Test/CakePHPInstallerTest.php b/tests/Composer/Installers/Test/CakePHPInstallerTest.php -index 976bd9b..523e847 100644 ---- a/tests/Composer/Installers/Test/CakePHPInstallerTest.php -+++ b/tests/Composer/Installers/Test/CakePHPInstallerTest.php -@@ -100,7 +100,7 @@ public function testGetLocations() { - - $this->setCakephpVersion($rm, '~8.8'); - $result = $installer->getLocations(); -- $this->assertEquals('vendor/{$vendor}/{$name}/', $result['plugin']); -+ $this->assertContains('vendor/{$vendor}/{$name}/', $result['plugin']); - } - - protected function setCakephpVersion($rm, $version) { diff --git a/php-composer-installers.spec b/php-composer-installers.spec index 9eb2bb4..5626ac4 100644 --- a/php-composer-installers.spec +++ b/php-composer-installers.spec @@ -12,8 +12,8 @@ %global github_owner composer %global github_name installers -%global github_version 1.0.21 -%global github_commit d64e23fce42a4063d63262b19b8e7c0f3b5e4c45 +%global github_version 1.0.22 +%global github_commit bd9b14f094c89c8b5804a4e41edeb7853bb85046 %global composer_vendor composer %global composer_project installers @@ -33,10 +33,6 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz -# Fix PHPUnit check in CakePHPInstallerTest -# https://github.com/composer/installers/pull/226 -Patch0: %{name}-pr226.patch - BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Tests @@ -80,8 +76,6 @@ installer to handle it. %prep %setup -qn %{github_name}-%{github_commit} -%patch0 -p1 - : Create autoloader cat <<'AUTOLOAD' | tee src/Composer/Installers/autoload.php <?php @@ -151,6 +145,9 @@ rm -rf %{buildroot} %changelog +* Fri Oct 30 2015 Remi Collet <remi@remirepo.net> - 1.0.22-1 +- update to 1.0.22 + * Tue Aug 25 2015 Remi Collet <remi@remirepo.net> - 1.0.21-1 - backport for #remirepo |