summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-symfony.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/php-symfony.spec b/php-symfony.spec
index 722d388..037dae5 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -40,8 +40,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"
# NOTE: Min version not 2.4 because autoloader required
%global doctrine_dbal_min_ver 2.5.4
@@ -106,7 +107,7 @@
Name: php-%{composer_project}
Version: %{github_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: PHP framework for web projects
License: MIT
@@ -195,7 +196,7 @@ BuildRequires: php-xml
# Bridges
Requires: php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
Requires: php-composer(%{composer_vendor}/monolog-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
@@ -424,7 +425,7 @@ instead.
Summary: Symfony Twig Bridge
# composer.json
-%if 0%{?fedora} < 25
+%if 0%{?fedora} < 25 && 0%{?rhel} < 8
Requires: php-composer(twig/twig) < 2
%else
Requires: php-composer(twig/twig) < %{twig_max_ver}
@@ -1859,7 +1860,7 @@ cp -rp src/Symfony/* %{buildroot}%{symfony_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}
@@ -1911,7 +1912,7 @@ done
%{!?_licensedir:%global license %%doc}
%files
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 8
%doc %{_docdir}/%{name}
%else
%doc %{_docdir}/%{name}-%{version}
@@ -2588,6 +2589,9 @@ done
# ##############################################################################
%changelog
+* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 2.8.46-2
+- ignore doctrine/data-fixtures version
+
* Mon Oct 1 2018 Remi Collet <remi@remirepo.net> - 2.8.46-1
- update to 2.8.46