From 9bdb323ae636b600bc206572381714f4aee44690 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Oct 2018 11:59:29 +0200 Subject: ignore doctrine/data-fixtures version --- php-symfony3.spec | 84 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/php-symfony3.spec b/php-symfony3.spec index 7106f01..c01e952 100644 --- a/php-symfony3.spec +++ b/php-symfony3.spec @@ -41,8 +41,9 @@ %global doctrine_common_min_ver 2.4 %global doctrine_common_max_ver 3.0 # "doctrine/data-fixtures": "1.0.*" +# ignore max version %global doctrine_datafixtures_min_ver 1.0.0 -%global doctrine_datafixtures_max_ver 1.1.0 +%global doctrine_datafixtures_max_ver 2 # "doctrine/dbal": "~2.4" %global doctrine_dbal_min_ver 2.4 %global doctrine_dbal_max_ver 3.0 @@ -112,7 +113,7 @@ Name: php-%{composer_project}3 Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Symfony PHP framework (version 3) Group: Development/Libraries @@ -211,7 +212,7 @@ BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0 Requires: php-composer(%{composer_vendor}/doctrine-bridge) = %{version} Requires: php-composer(%{composer_vendor}/monolog-bridge) = %{version} #Requires: php-composer(%%{composer_vendor}/phpunit-bridge) = %%{version} -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 # this requires ZF and thus PHP 7 Requires: php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version} %endif @@ -298,7 +299,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/validator) Suggests: php-composer(%{composer_vendor}/property-info) @@ -342,7 +343,7 @@ Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} Requires: php-composer(monolog/monolog) < %{monolog_max_ver} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/console) Suggests: php-composer(%{composer_vendor}/event-dispatcher) Suggests: php-composer(%{composer_vendor}/symfony/security-core) @@ -372,7 +373,7 @@ Summary: Symfony PHPUnit Bridge (version 3) Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/debug) Suggests: php-pecl(zip) %endif @@ -430,7 +431,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: php-composer(twig/twig) >= %{twig_min_ver} Requires: php-composer(twig/twig) < %{twig_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/asset) Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/finder) @@ -473,7 +474,7 @@ Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version} Requires: php-composer(%{composer_vendor}/var-dumper) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/dependency-injection) %endif @@ -507,7 +508,7 @@ Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/routing) = %{version} Requires: php-xml # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/console) Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/property-info) @@ -528,7 +529,7 @@ Requires: php-pcre Requires: php-reflection Requires: php-spl Requires: php-tokenizer -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) %endif @@ -559,7 +560,7 @@ Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_ Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} Requires: php-composer(%{composer_vendor}/security) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/security-acl) %endif # phpcompatinfo (computed from version 3.3.6) @@ -653,7 +654,7 @@ Requires: php-composer(%{composer_vendor}/process) = %{version} Requires: php-ctype Requires: php-posix Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pcntl # composer.json: optional Suggests: php-composer(%{composer_vendor}/monolog-bridge) @@ -677,7 +678,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/asset.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/http-foundation) %endif # phpcompatinfo (computed from version 3.3.6) @@ -703,7 +704,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/browser_kit.htm # composer.json Requires: php-composer(%{composer_vendor}/dom-crawler) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/process) %endif # phpcompatinfo (computed from version 3.3.6) @@ -744,7 +745,7 @@ Requires: php-pcre Requires: php-pdo Requires: php-reflection Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) Suggests: php-pecl(memcached) Suggests: php-pecl(opcache) @@ -779,7 +780,7 @@ Requires: php-pcre Requires: php-reflection Requires: php-spl Requires: php-tokenizer -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) Suggests: php-xcache %endif @@ -821,7 +822,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/config.html # composer.json Requires: php-composer(%{composer_vendor}/filesystem) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/yaml) %endif # phpcompatinfo (computed from version 3.3.6) @@ -854,7 +855,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/console.html # composer.json Requires: php-composer(%{composer_vendor}/debug) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/event-dispatcher) Suggests: php-composer(%{composer_vendor}/lock) Suggests: php-composer(%{composer_vendor}/process) @@ -918,7 +919,7 @@ Requires: php-json Requires: php-pcre Requires: php-reflection Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(Xdebug) %endif @@ -942,7 +943,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: php-composer(psr/container) >= %{psr_container_min_ver} Requires: php-composer(psr/container) < %{psr_container_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/finder) @@ -976,7 +977,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/dom_crawler.htm Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/css-selector) %endif # phpcompatinfo (computed from version 3.3.6) @@ -1024,7 +1025,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/event_dispatche Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/dependency-injection) Suggests: php-composer(%{composer_vendor}/http-kernel) %endif @@ -1125,7 +1126,7 @@ Requires: php-composer(%{composer_vendor}/intl) = %{version} Requires: php-composer(%{composer_vendor}/options-resolver) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/framework-bundle) Suggests: php-composer(%{composer_vendor}/security-csrf) Suggests: php-composer(%{composer_vendor}/twig-bridge) @@ -1172,7 +1173,7 @@ Requires: php-pdo Requires: php-session Requires: php-sockets Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(mongo) %endif @@ -1206,7 +1207,7 @@ Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/browser-kit) Suggests: php-composer(%{composer_vendor}/class-loader) Suggests: php-composer(%{composer_vendor}/config) @@ -1225,7 +1226,7 @@ Requires: php-reflection Requires: php-session Requires: php-spl Requires: php-tokenizer -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) Suggests: php-pecl(opcache) Suggests: php-pecl(Xdebug) @@ -1336,7 +1337,7 @@ Requires: php-hash Requires: php-pcre Requires: php-posix Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-pecl(memcached) Suggests: php-sysvsem %endif @@ -1404,7 +1405,7 @@ Requires: php-composer(%{composer_vendor}/inflector) = %{version} Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver} Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(psr/cache-implementation) %endif # phpcompatinfo (computed from version 3.3.6) @@ -1431,7 +1432,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/property_info.h # composer.json Requires: php-composer(%{composer_vendor}/inflector) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/doctrine-bridge) Suggests: php-composer(%{composer_vendor}/serializer) Suggests: php-composer(psr/cache-implementation) @@ -1462,7 +1463,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/routing.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/dependency-injection) Suggests: php-composer(%{composer_vendor}/expression-language) @@ -1501,7 +1502,7 @@ Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} Requires: php-composer(%{composer_vendor}/property-access) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/ldap) @@ -1548,7 +1549,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/serializer.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/http-foundation) Suggests: php-composer(%{composer_vendor}/property-access) @@ -1607,7 +1608,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/templating.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(psr/log) %endif # phpcompatinfo (computed from version 3.3.6) @@ -1639,7 +1640,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/translation.htm Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/yaml) Suggests: php-composer(psr/log) @@ -1673,7 +1674,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/validator.html # composer.json Requires: php-composer(%{composer_vendor}/translation) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/http-foundation) @@ -1730,7 +1731,7 @@ Requires: php-posix Requires: php-reflection Requires: php-spl Requires: php-xml -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-intl Suggests: php-mysql Suggests: php-pecl(amqp) @@ -1768,7 +1769,7 @@ Requires: php-composer(fig/link-util) >= %{fig_link_util_min_ver} Requires: php-composer(psr/link) < %{psr_link_max_ver} Requires: php-composer(psr/link) >= %{psr_link_min_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/http-kernel) %endif # phpcompatinfo (computed from version 3.3.6) @@ -1813,7 +1814,7 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/yaml.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/console) %endif # phpcompatinfo (computed from version 3.3.6) @@ -1936,7 +1937,7 @@ cp -rp src/Symfony/* %{buildroot}%{symfony3_dir}/ # Symlink main package docs to common sub-package docs mkdir -p %{buildroot}%{_docdir} -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 8 ln -s %{name}-common %{buildroot}%{_docdir}/%{name} %else ln -s %{name}-common-%{version} %{buildroot}%{_docdir}/%{name}-%{version} @@ -2001,7 +2002,7 @@ exit $RET %{!?_licensedir:%global license %%doc} %files -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 8 %doc %{_docdir}/%{name} %else %doc %{_docdir}/%{name}-%{version} @@ -2807,6 +2808,9 @@ exit $RET # ############################################################################## %changelog +* Thu Oct 18 2018 Remi Collet - 3.4.17-2 +- ignore doctrine/data-fixtures version + * Wed Oct 3 2018 Remi Collet - 3.4.17-1 - update to 3.4.17 -- cgit