diff options
| -rw-r--r-- | php-silex.spec | 130 |
1 files changed, 106 insertions, 24 deletions
diff --git a/php-silex.spec b/php-silex.spec index f1b6708..b2db2d7 100644 --- a/php-silex.spec +++ b/php-silex.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-silex # -# Copyright (c) 2015 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner silexphp %global github_name Silex -%global github_version 1.3.4 -%global github_commit d6de62716fcda76084f3015165125f30b1563517 +%global github_version 1.3.5 +%global github_commit 374c7e04040a6f781c90f7d746726a5daa78e783 %global composer_vendor silex %global composer_project silex @@ -21,22 +21,27 @@ # "php": ">=5.3.9" %global php_min_ver 5.3.9 # "doctrine/dbal": "~2.2" -%global doctrine_dbal_min_ver 2.2 +# NOTE: Min version not 2.2 because autoloader required +%global doctrine_dbal_min_ver 2.5.4 %global doctrine_dbal_max_ver 3.0 # "monolog/monolog": "^1.4.1" -%global monolog_min_ver 1.4.1 +# NOTE: Min version not 1.4.1 because autoloader required +%global monolog_min_ver 1.15.0 %global monolog_max_ver 2.0.0 # "pimple/pimple": "~1.0" %global pimple_min_ver 1.0 %global pimple_max_ver 2.0 # "swiftmailer/swiftmailer": "~5" -%global swiftmailer_min_ver 5.0 +# NOTE: Min version not 5.0 because autoloader required +%global swiftmailer_min_ver 5.4.1 %global swiftmailer_max_ver 6.0 # "symfony/*": "~2.3|3.0.*" -%global symfony_min_ver 2.3 +# NOTE: Min version not 2.3 because autoloaders required +%global symfony_min_ver 2.7.1 %global symfony_max_ver 3.1 # "twig/twig": "~1.8|~2.0" -%global twig_min_ver 1.8 +# NOTE: Min version not 1.8 because autoloader required +%global twig_min_ver 1.18.2 %global twig_max_ver 3.0 # Build using "--without tests" to disable tests @@ -56,6 +61,8 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{githu BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Library version value check +BuildRequires: php-cli # %%{pear_phpdir} macro BuildRequires: php-pear # Tests @@ -65,8 +72,9 @@ BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} -BuildRequires: php-composer(pimple/pimple) >= %{pimple_min_ver} BuildRequires: php-composer(pimple/pimple) < %{pimple_max_ver} +BuildRequires: php-composer(pimple/pimple) >= %{pimple_min_ver} +BuildRequires: php-composer(swiftmailer/swiftmailer) >= %{swiftmailer_min_ver} BuildRequires: php-composer(symfony/browser-kit) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/config) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/css-selector) >= %{symfony_min_ver} @@ -80,7 +88,6 @@ BuildRequires: php-composer(symfony/http-kernel) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/locale) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/monolog-bridge) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/options-resolver) >= %{symfony_min_ver} -#BuildRequires: php-composer(symfony/phpunit-bridge) >= %%{symfony_min_ver} BuildRequires: php-composer(symfony/process) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/routing) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/security) >= %{symfony_min_ver} @@ -89,8 +96,7 @@ BuildRequires: php-composer(symfony/translation) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/twig-bridge) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/validator) >= %{symfony_min_ver} BuildRequires: php-composer(twig/twig) >= %{twig_min_ver} -BuildRequires: php-swift-Swift >= %{swiftmailer_min_ver} -## phpcompatinfo (computed from version 1.3.4) +## phpcompatinfo (computed from version 1.3.5) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre @@ -114,7 +120,7 @@ Requires: php-composer(symfony/http-kernel) >= %{symfony_min_ver} Requires: php-composer(symfony/http-kernel) < %{symfony_max_ver} Requires: php-composer(symfony/routing) >= %{symfony_min_ver} Requires: php-composer(symfony/routing) < %{symfony_max_ver} -# phpcompatinfo (computed from version 1.3.4) +# phpcompatinfo (computed from version 1.3.5) Requires: php-date Requires: php-pcre Requires: php-reflection @@ -124,6 +130,40 @@ Requires: php-tokenizer # Autoloader Requires: php-composer(symfony/class-loader) +# Weak dependencies +%if 0%{?fedora} >= 21 +Suggests: php-composer(doctrine/dbal) +Suggests: php-composer(monolog/monolog) +Suggests: php-composer(swiftmailer/swiftmailer) +Suggests: php-composer(symfony/browser-kit) +Suggests: php-composer(symfony/debug) +Suggests: php-composer(symfony/doctrine-bridge) +Suggests: php-composer(symfony/finder) +Suggests: php-composer(symfony/form) +Suggests: php-composer(symfony/locale) +Suggests: php-composer(symfony/monolog-bridge) +Suggests: php-composer(symfony/process) +Suggests: php-composer(symfony/security) +Suggests: php-composer(symfony/serializer) +Suggests: php-composer(symfony/translation) +Suggests: php-composer(symfony/twig-bridge) +Suggests: php-composer(symfony/validator) +Suggests: php-composer(twig/twig) +Suggests: php-PsrLog +%endif +Conflicts: php-composer(doctrine/dbal) < %{doctrine_dbal_min_ver} +Conflicts: php-composer(doctrine/dbal) >= %{doctrine_dbal_max_ver} +Conflicts: php-composer(monolog/monolog) < %{monolog_min_ver} +Conflicts: php-composer(monolog/monolog) >= %{monolog_max_ver} +Conflicts: php-composer(swiftmailer/swiftmailer) < %{swiftmailer_min_ver} +Conflicts: php-composer(swiftmailer/swiftmailer) >= %{swiftmailer_max_ver} +Conflicts: php-composer(twig/twig) < %{twig_min_ver} +Conflicts: php-composer(twig/twig) >= %{twig_max_ver} +Conflicts: php-PsrLog < 1.0.0-8 +Conflicts: php-PsrLog >= 2.0 + +# php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT} +Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release} # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -149,8 +189,7 @@ cat <<'AUTOLOAD' | tee src/Silex/autoload.php <?php /** * Autoloader for %{name} and its' dependencies - * - * Created by %{name}-%{version}-%{release} + * (created by %{name}-%{version}-%{release}). * * @return \Symfony\Component\ClassLoader\ClassLoader */ @@ -166,15 +205,32 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo $fedoraClassLoader->addPrefix('Silex\\', dirname(__DIR__)); +// Required dependencies require_once '%{phpdir}/Pimple1/autoload.php'; - -if (file_exists('%{pear_phpdir}/Swift')) { - $fedoraClassLoader->addPrefix('Swift_', '%{pear_phpdir}/Swift'); -} - -// Not all dependency autoloaders exist or are in every dist yet so fallback -// to using include path for dependencies for now -$fedoraClassLoader->setUseIncludePath(true); +require_once '%{phpdir}/Symfony/Component/EventDispatcher/autoload.php'; +require_once '%{phpdir}/Symfony/Component/HttpFoundation/autoload.php'; +require_once '%{phpdir}/Symfony/Component/HttpKernel/autoload.php'; +require_once '%{phpdir}/Symfony/Component/Routing/autoload.php'; + +// Optional dependencies +@include_once '%{phpdir}/Doctrine/DBAL/autoload.php'; +@include_once '%{phpdir}/Monolog/autoload.php'; +@include_once '%{phpdir}/Psr/Log/autoload.php'; +@include_once '%{phpdir}/Swift/swift_required.php'; +@include_once '%{phpdir}/Symfony/Bridge/Doctrine/autoload.php'; +@include_once '%{phpdir}/Symfony/Bridge/Monolog/autoload.php'; +@include_once '%{phpdir}/Symfony/Bridge/Twig/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/BrowserKit/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Debug/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Finder/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Form/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Locale/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Process/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Security/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Serializer/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Translation/autoload.php'; +@include_once '%{phpdir}/Symfony/Component/Validator/autoload.php'; +@include_once '%{phpdir}/Twig/autoload.php'; return $fedoraClassLoader; AUTOLOAD @@ -192,6 +248,14 @@ cp -rp src/* %{buildroot}%{phpdir}/ %check +: Library version value check +%{_bindir}/php -r ' + require_once "%{buildroot}%{phpdir}/Silex/autoload.php"; + $version = \Silex\Application::VERSION; + echo "Version $version (expected %{version})\n"; + exit(version_compare("%{version}", "$version", "=") ? 0 : 1); +' + %if %{with_tests} : Create test bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php @@ -201,6 +265,11 @@ $fedoraClassLoader = require_once '%{buildroot}%{phpdir}/Silex/autoload.php'; $fedoraClassLoader->addPrefix('Silex\\Tests\\', __DIR__ . '/tests'); + +require_once '%{phpdir}/Symfony/Component/Config/autoload.php'; +require_once '%{phpdir}/Symfony/Component/CssSelector/autoload.php'; +require_once '%{phpdir}/Symfony/Component/DomCrawler/autoload.php'; +require_once '%{phpdir}/Symfony/Component/OptionsResolver/autoload.php'; BOOTSTRAP : Temporarily skip tests known to fail @@ -209,7 +278,11 @@ rm -f \ tests/Silex/Tests/Application/SwiftmailerTraitTest.php : Run tests -%{_bindir}/phpunit --verbose --bootstrap ./bootstrap.php +%{_bindir}/phpunit --verbose --bootstrap bootstrap.php + +if which php70; then + php70 %{_bindir}/phpunit --verbose --bootstrap bootstrap.php +fi %else : Tests skipped %endif @@ -230,6 +303,15 @@ rm -rf %{buildroot} %changelog +* Tue Mar 29 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.5-1 +- Updated to 1.3.5 (RHBZ #1296756) +- Updated dependency versions for their autoloaders and updated autoloader + to use dependency autoloaders +- Added php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT} virtual provide +- php-swift-Swift => php-composer(swiftmailer/swiftmailer) +- Added weak dependencies +- Added library version value check + * Sun Oct 11 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.4-1 - Updated to 1.3.4 (RHBZ #1256774) |