sync with FedoraHEADmaster

1 files changed, 34 insertions, 35 deletions

diff --git a/php-patchwork-utf8.spec b/php-patchwork-utf8.spec
index f9f97c5..dfcff4d 100644
--- a/php-patchwork-utf8.spec
+++ b/php-patchwork-utf8.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-patchwork-utf8
 #
-# Copyright (c) 2015-2017 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -22,20 +22,15 @@
 %global php_min_ver 5.3.0
 
 # Build using "--without tests" to disable tests
-%if 0%{?rhel} == 5
-%global with_tests 0%{?_with_tests:1}
-%else
 %global with_tests 0%{!?_without_tests:1}
-%endif
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       3%{?github_release}%{?dist}
+Release:       9%{?github_release}%{?dist}
 Summary:       Portable and performant UTF-8, Unicode and Grapheme Clusters for PHP
 
-Group:         Development/Libraries
 License:       ASL 2.0 or GPLv2
 URL:           https://github.com/%{github_owner}/%{github_name}
 
@@ -48,10 +43,11 @@ Source1:       %{name}-get-source.sh
 # https://github.com/tchwork/utf8/pull/64
 Patch0:        %{name}-pull-request-64.patch
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
+%if 0%{?rhel} == 6
 # Relative paths
 BuildRequires: python
+%endif
 # Tests
 %if %{with_tests}
 BuildRequires: php-composer(phpunit/phpunit)
@@ -124,8 +120,6 @@ ln -s autoload-utf8.php src/Patchwork/autoload.php
 
 
 %install
-rm -rf %{buildroot}
-
 : Library
 mkdir -p %{buildroot}%{phpdir}
 cp -rp src/Patchwork %{buildroot}%{phpdir}/
@@ -134,54 +128,55 @@ cp -rp src/Patchwork %{buildroot}%{phpdir}/
 mkdir -p %{buildroot}%{_datadir}/%{name}
 mv %{buildroot}%{phpdir}/Patchwork/Utf8/data %{buildroot}%{_datadir}/%{name}/
 ln -s \
+%if 0%{?rhel} == 6
     %(python -c "import os.path; print os.path.relpath('%{_datadir}/%{name}/data', '%{phpdir}/Patchwork/Utf8')") \
+%else
+    $(realpath --relative-to='%{buildroot}%{phpdir}/Patchwork/Utf8' '%{buildroot}%{_datadir}/%{name}/data') \
+%endif
     %{buildroot}%{phpdir}/Patchwork/Utf8/data
 mv %{buildroot}%{phpdir}/Patchwork/PHP/Shim/charset %{buildroot}%{_datadir}/%{name}/shim-charset
 ln -s \
+%if 0%{?rhel} == 6
     %(python -c "import os.path; print os.path.relpath('%{_datadir}/%{name}/shim-charset', '%{phpdir}/Patchwork/PHP/Shim')") \
+%else
+    $(realpath --relative-to='%{buildroot}%{phpdir}/Patchwork/PHP/Shim' '%{buildroot}%{_datadir}/%{name}/shim-charset') \
+%endif
     %{buildroot}%{phpdir}/Patchwork/PHP/Shim/charset
 mv %{buildroot}%{phpdir}/Patchwork/PHP/Shim/unidata %{buildroot}%{_datadir}/%{name}/shim-unidata
 ln -s \
+%if 0%{?rhel} == 6
     %(python -c "import os.path; print os.path.relpath('%{_datadir}/%{name}/shim-unidata', '%{phpdir}/Patchwork/PHP/Shim')") \
+%else
+    $(realpath --relative-to='%{buildroot}%{phpdir}/Patchwork/PHP/Shim' '%{buildroot}%{_datadir}/%{name}/shim-unidata') \
+%endif
     %{buildroot}%{phpdir}/Patchwork/PHP/Shim/unidata
 
 %check
 %if %{with_tests}
-run=0
-ret=0
-if which php56; then
-   php56 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-utf8.php || ret=1
-   run=1
-fi
-if which php70; then
-   php70 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-utf8.php || ret=1
-   run=1
-fi
-if which php71; then
-   php71 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-utf8.php || : ignore
-   run=1
-fi
-%if 0%{?rhel}
-: drop failing test with 5.4
-rm  tests/PHP/Shim/IntlTest.php
+%if 0%{?fedora} >= 30
+: Skip tests known to fail
+sed \
+    -e 's/function testConstants/function SKIP_testConstants/' \
+    -e 's/function testIsNormalized/function SKIP_testIsNormalized/' \
+    -e 's/function testNormalize/function SKIP_testNormalize/' \
+    -i tests/PHP/Shim/NormalizerTest.php
+sed 's/function testFilterRequestInputs/function SKIP_testFilterRequestInputs/' \
+    -i tests/Utf8/BootupTest.php
+sed \
+    -e 's/function testStrCase/function SKIP_testStrCase/' \
+    -e 's/function testJson_decode/function SKIP_testJson_decode/' \
+    -e 's/function testFilter/function SKIP_testFilter/' \
+    -i tests/Utf8Test.php
 %endif
 
-if [ $run -eq 0 ]; then
 %{_bindir}/phpunit --verbose \
     --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-utf8.php
-fi
-exit $ret
 %else
 : Tests skipped
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE*
 %doc *.md
@@ -193,6 +188,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 29 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.1-9
+- Fix install symlink
+- Skip tests known to fail on Fedora >= 30
+
 * Sat Feb 25 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.3.1-3
 - Fix FTBFS in rawhide (RHBZ #1424074)
 - Use php-composer(fedora/autoloader)