diff options
| -rw-r--r-- | Autoload-rpm.patch | 12 | ||||
| -rw-r--r-- | php-theseer-autoload.spec | 14 |
2 files changed, 12 insertions, 14 deletions
diff --git a/Autoload-rpm.patch b/Autoload-rpm.patch index cfc8ddd..78a0a69 100644 --- a/Autoload-rpm.patch +++ b/Autoload-rpm.patch @@ -1,11 +1,5 @@ --- phpab.php.rpm 2014-11-25 11:32:11.000000000 +0100 +++ phpab.php 2014-11-25 14:40:59.288514790 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env php -+#!/usr/bin/php - <?php - /** - * Copyright (c) 2009-2014 Arne Blankerts <arne@blankerts.de> @@ -42,12 +42,15 @@ * 4 - Lint Error */ @@ -17,9 +11,9 @@ ini_set('date.timezone', 'UTC'); } -require __DIR__ . '/src/autoload.php'; -+require 'TheSeer/DirectoryScanner/autoload.php'; -+require 'TheSeer/Autoload/autoload.php'; -+require 'ezc/Base/base.php'; ++require '/usr/share/php/TheSeer/DirectoryScanner/autoload.php'; ++require '/usr/share/php/TheSeer/Autoload/autoload.php'; ++require '/usr/share/php/ezc/Base/base.php'; +spl_autoload_register(array('\ezcBase','autoload')); $factory = new \TheSeer\Autoload\Factory(); diff --git a/php-theseer-autoload.spec b/php-theseer-autoload.spec index 17c0325..502b94d 100644 --- a/php-theseer-autoload.spec +++ b/php-theseer-autoload.spec @@ -16,7 +16,7 @@ Name: php-theseer-autoload Version: 1.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool and library to generate autoload code Group: Development/Libraries @@ -31,8 +31,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.3.1 # For tests -BuildRequires: php-composer(theseer/directoryscanner) >= 1.3.0 -BuildRequires: php-composer(theseer/directoryscanner) < 1.4 +BuildRequires: php-composer(theseer/directoryscanner) >= 1.3 +BuildRequires: php-composer(theseer/directoryscanner) < 2 BuildRequires: %{_bindir}/phpunit # From composer.json @@ -41,8 +41,8 @@ BuildRequires: %{_bindir}/phpunit Requires: php(language) >= 5.3.1 Requires: php-composer(theseer/directoryscanner) >= 1.3 Requires: php-composer(theseer/directoryscanner) < 2 -# Use ezc instead of zetacomponent (no release, no package) -Requires: php-pear(components.ez.no/ConsoleTools) >= 1.6 +Requires: php-composer(zetacomponents/console-tools) >= 1.7 +Requires: php-composer(zetacomponents/console-tools) < 2 # From phpcompatinfo report for version 1.16.1 Requires: php-date Requires: php-json @@ -115,6 +115,10 @@ fi %changelog +* Wed Jun 3 2015 Remi Collet <remi@fedoraproject.org> - 1.17.0-2 +- swicth from eZ to Zeta Components +- ensure compatibility with SCL + * Fri May 15 2015 Remi Collet <remi@fedoraproject.org> - 1.17.0-1 - Update to 1.17.0 |