summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-15 15:15:44 +0200
committerRemi Collet <remi@remirepo.net>2017-05-15 15:15:44 +0200
commit26fdefb1a2792503eca8d0195a2adefc2b6ef6e6 (patch)
treeb8fa341a0e6c68ceb58196413f050d92c83a3664
parentbde9ea9a6a3584dc9f28c6d8d3bd6c50f0f451e8 (diff)
sync with Fedora
-rw-r--r--php-doctrine-doctrine-cache-bundle.spec45
1 files changed, 34 insertions, 11 deletions
diff --git a/php-doctrine-doctrine-cache-bundle.spec b/php-doctrine-doctrine-cache-bundle.spec
index ad76eff..a73a785 100644
--- a/php-doctrine-doctrine-cache-bundle.spec
+++ b/php-doctrine-doctrine-cache-bundle.spec
@@ -33,9 +33,8 @@
# "symfony/finder": "~2.2|~3.0",
# "symfony/framework-bundle": "~2.2|~3.0",
# "symfony/security-acl": "~2.3|~3.0",
-# NOTE: Min version not 2.3 because autoloader required
+# NOTE: Min version not 2.3 because autoloader required
%global symfony_min_ver 2.7.1
-# TODO: should 4.0, keep 3.0 because of autoloader
%global symfony_max_ver 4.0
# Build using "--without tests" to disable tests
@@ -45,7 +44,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Symfony2 Bundle for Doctrine Cache
Group: Development/Libraries
@@ -75,7 +74,7 @@ BuildRequires: php-composer(symfony/validator) < %{symfony_max_ver}
BuildRequires: php-composer(symfony/validator) >= %{symfony_min_ver}
BuildRequires: php-composer(symfony/yaml) < %{symfony_max_ver}
BuildRequires: php-composer(symfony/yaml) >= %{symfony_min_ver}
-%if 0%{?el6}
+%if 0
BuildRequires: php-composer(symfony/security) < %{symfony_max_ver}
BuildRequires: php-composer(symfony/security) >= %{symfony_min_ver}
%else
@@ -142,11 +141,17 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required(array(
'%{phpdir}/Doctrine/Common/Cache/autoload.php',
'%{phpdir}/Doctrine/Common/Inflector/autoload.php',
- '%{phpdir}/Symfony/Bridge/Doctrine/autoload.php',
+ array(
+ '%{phpdir}/Symfony3/Bridge/Doctrine/autoload.php',
+ '%{phpdir}/Symfony/Bridge/Doctrine/autoload.php',
+ ),
));
\Fedora\Autoloader\Dependencies::optional(array(
- '%{phpdir}/Symfony/Component/Security/autoload.php',
+ array(
+ '%{phpdir}/Symfony3/Component/Security/autoload.php',
+ '%{phpdir}/Symfony/Component/Security/autoload.php',
+ ),
));
AUTOLOAD
@@ -165,11 +170,26 @@ cat <<'BOOTSTRAP' | tee bootstrap.php
require_once '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineCacheBundle/autoload.php';
\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/Symfony/Bundle/FrameworkBundle/autoload.php',
- '%{phpdir}/Symfony/Component/Console/autoload.php',
- '%{phpdir}/Symfony/Component/Finder/autoload.php',
- '%{phpdir}/Symfony/Component/Validator/autoload.php',
- '%{phpdir}/Symfony/Component/Yaml/autoload.php',
+ array(
+ '%{phpdir}/Symfony3/Bundle/FrameworkBundle/autoload.php',
+ '%{phpdir}/Symfony/Bundle/FrameworkBundle/autoload.php',
+ ),
+ array(
+ '%{phpdir}/Symfony3/Component/Console/autoload.php',
+ '%{phpdir}/Symfony/Component/Console/autoload.php',
+ ),
+ array(
+ '%{phpdir}/Symfony3/Component/Finder/autoload.php',
+ '%{phpdir}/Symfony/Component/Finder/autoload.php',
+ ),
+ array(
+ '%{phpdir}/Symfony3/Component/Validator/autoload.php',
+ '%{phpdir}/Symfony/Component/Validator/autoload.php',
+ ),
+ array(
+ '%{phpdir}/Symfony3/Component/Yaml/autoload.php',
+ '%{phpdir}/Symfony/Component/Yaml/autoload.php',
+ ),
));
BOOTSTRAP
@@ -211,6 +231,9 @@ exit $RETURN_CODE
%changelog
+* Sun May 14 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.0-4
+- Fix autoloder for Symfony 3
+
* Fri May 12 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.0-3
- Switch autoloader to php-composer(fedora/autoloader)
- Add max versions to build dependencies