summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-29 06:36:28 +0200
committerRemi Collet <remi@remirepo.net>2018-05-29 06:36:28 +0200
commit4cbd97ef08e45bacd3d0d0b30a425b0d2fac2a07 (patch)
treee8422455f0706aec41152afee373902d265907ce
parenta26fe6635e669fb85b80e77e2bd941ca4e173a96 (diff)
Sync with Fedora:
* Mon May 28 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.1-3 - Fix FTBS (RHBZ #1556121) - Disable tests by default for F28+ and RHEL 8+ - Add range version dependencies for Fedora >= 27 || RHEL >= 8
-rw-r--r--php-zetacomponents-document.spec23
1 files changed, 21 insertions, 2 deletions
diff --git a/php-zetacomponents-document.spec b/php-zetacomponents-document.spec
index 64ce355..365d99d 100644
--- a/php-zetacomponents-document.spec
+++ b/php-zetacomponents-document.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-zetacomponents-document
#
-# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -27,14 +27,19 @@
%global zetacomponents_unit_test_min_ver 1.0
%global zetacomponents_unit_test_max_ver 2.0
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
+# Build using "--with tests" to enable tests
+%global with_tests 0%{?_with_tests:1}
+%else
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
+%endif
%global ezcdir %{_datadir}/php/ezc
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 3%{?github_release}%{?dist}
Summary: Provides a general conversion framework for different documents
Group: Development/Libraries
@@ -48,10 +53,15 @@ BuildRequires: php-fedora-autoloader-devel
# Tests
%if %{with_tests}
## composer.json
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(zetacomponents/base) >= %{zetacomponents_base_min_ver} with php-composer(zetacomponents/base) < %{zetacomponents_base_max_ver})
+BuildRequires: (php-composer(zetacomponents/unit-test) >= %{zetacomponents_unit_test_min_ver} with php-composer(zetacomponents/unit-test) < %{zetacomponents_unit_test_max_ver})
+%else
BuildRequires: php-composer(zetacomponents/base) < %{zetacomponents_base_max_ver}
BuildRequires: php-composer(zetacomponents/base) >= %{zetacomponents_base_min_ver}
BuildRequires: php-composer(zetacomponents/unit-test) < %{zetacomponents_unit_test_max_ver}
BuildRequires: php-composer(zetacomponents/unit-test) >= %{zetacomponents_unit_test_min_ver}
+%endif
## phpcompatinfo (computed from version 1.3.1)
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-composer(phpunit/phpunit)
@@ -66,8 +76,12 @@ BuildRequires: php-xsl
%endif
# composer.json
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(zetacomponents/base) >= %{zetacomponents_base_min_ver} with php-composer(zetacomponents/base) < %{zetacomponents_base_max_ver})
+%else
Requires: php-composer(zetacomponents/base) < %{zetacomponents_base_max_ver}
Requires: php-composer(zetacomponents/base) >= %{zetacomponents_base_min_ver}
+%endif
# phpcompatinfo (computed from version 1.3.1)
Requires: php(language) >= 5.3.0
Requires: php-ctype
@@ -194,5 +208,10 @@ exit $RETURN_CODE
%changelog
+* Mon May 28 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.1-3
+- Fix FTBS (RHBZ #1556121)
+- Disable tests by default for F28+ and RHEL 8+
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+
* Sun Jun 04 2017 Shawn Iwinski <shawn@iwin.ski> - 1.3.1-1
- Initial package