diff options
| author | Remi Collet <remi@remirepo.net> | 2017-05-30 09:49:45 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-05-30 09:49:45 +0200 |
| commit | e0dfce72246f9ea5ceb9fa0851111cbe85cc74aa (patch) | |
| tree | 056dec1de917d0d60037197502d7c659508f51c7 | |
| parent | 75006a2c9d3055bab617d194b89aa40b41a0e434 (diff) | |
allow to force Symfony version using RPM_SYMFONY_TREE
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | php-doctrine-dbal.spec | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index a6c8722..81e056e 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -41,7 +41,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Doctrine Database Abstraction Layer (DBAL) Group: Development/Libraries @@ -154,7 +154,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::optional(array( array( - '%{phpdir}/Symfony3/Component/Console/autoload.php', + (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony3') . '/Component/Console/autoload.php', '%{phpdir}/Symfony/Component/Console/autoload.php', ), )); @@ -186,7 +186,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71; do +for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71 php72; do if which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit --verbose || RETURN_CODE=1 fi @@ -212,6 +212,9 @@ rm -rf %{buildroot} %changelog +* Tue May 30 2017 Remi Collet <remi@remirepo.net> - 2.5.12-3 +- allow to force Symfony version using RPM_SYMFONY_TREE + * Sat Mar 11 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.5.12-1 - Updated to 2.5.12 (RHBZ #1412852) - Switch autoloader to php-composer(fedora/autoloader) |