diff options
| author | Remi Collet <remi@remirepo.net> | 2017-11-02 16:01:04 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-11-02 16:01:04 +0100 |
| commit | 103b4e3e08d29dcc0a247418b6bf645019322824 (patch) | |
| tree | 48531b1b62b6d05b26dbbf6c7470d60609474605 /php-EasyRdf.spec | |
| parent | b7e92754edf6b53aaf6e4d52f0c512ca564104ad (diff) | |
add upstream patch for PHP 7.1 and 7.2
Diffstat (limited to 'php-EasyRdf.spec')
| -rw-r--r-- | php-EasyRdf.spec | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/php-EasyRdf.spec b/php-EasyRdf.spec index 1d67799..617fa4a 100644 --- a/php-EasyRdf.spec +++ b/php-EasyRdf.spec @@ -36,7 +36,7 @@ Name: php-EasyRdf Version: 0.9.0 -Release: 6%{?dist} +Release: 8%{?dist} Summary: A PHP library designed to make it easy to consume and produce RDF Group: Development/Libraries @@ -44,7 +44,10 @@ License: BSD URL: http://www.easyrdf.org Source0: %{url}/downloads/easyrdf-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Upstream patches +Patch0: 4ed264051ed407d59c2fde4128be176e96e8f22a.patch +Patch1: 5eb5154fec8b3d3df666628ba2f3636c0fa385c3.patch + BuildArch: noarch # Tests %if %{with_tests} @@ -136,6 +139,8 @@ Group: Documentation %prep %setup -qn easyrdf-%{version} +%patch0 -p1 +%patch1 -p1 %build @@ -153,7 +158,6 @@ AUTOLOAD %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{phpdir} cp -rp lib/* %{buildroot}%{phpdir}/ @@ -185,27 +189,13 @@ PHPUNIT rm -f test/EasyRdf/Parser/RedlandTest.php %endif -: Skip tests known to fail since PHP 7.1 -: See https://github.com/njh/easyrdf/issues/276 -%if 0%{?fedora} > 25 -sed \ - -e 's/function testSerialiseDot/function SKIP_testSerialiseDot/' \ - -e 's/function testSerialiseDotUseLabels/function SKIP_testSerialiseDotUseLabels/' \ - -e 's/function testSerialiseDotOnlyLabelled/function SKIP_testSerialiseDotOnlyLabelled/' \ - -e 's/function testSerialisePng/function SKIP_testSerialisePng/' \ - -e 's/function testSerialiseGif/function SKIP_testSerialiseGif/' \ - -e 's/function testSerialiseSvg/function SKIP_testSerialiseSvg/' \ - -e 's/function testDotNotFound/function SKIP_testDotNotFound/' \ - -i test/EasyRdf/Serialiser/GraphVizTest.php -%endif - : Upstream tests %{_bindir}/phpunit --verbose : Upstream tests with SCLs if available SCL_RETURN_CODE=0 # Note: No php71 because of skipped tests above -for SCL in %{?rhel:php54 php55} php56 php70; do +for SCL in %{?rhel:php54 php55} php56 php70 php71 php72; do if which $SCL; then $SCL %{_bindir}/phpunit || SCL_RETURN_CODE=1 fi @@ -216,12 +206,7 @@ exit $SCL_RETURN_CODE %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE.md %doc CHANGELOG.md @@ -238,6 +223,10 @@ rm -rf %{buildroot} %changelog +* Thu Nov 2 2017 Remi Collet <remi@remirepo.net> - 0.9.0-8 +- add upstream patch for PHP 7.1 +- add upstream patch for PHP 7.2 + * Wed Feb 22 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.9.0-6 - Fix FTBS in rawhide (RHBZ #1424061) - Skip tests known to fail since PHP 7.1 (see https://github.com/njh/easyrdf/issues/276) |