summaryrefslogtreecommitdiffstats
path: root/php-zetacomponents-base.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-zetacomponents-base.spec')
-rw-r--r--php-zetacomponents-base.spec26
1 files changed, 16 insertions, 10 deletions
diff --git a/php-zetacomponents-base.spec b/php-zetacomponents-base.spec
index 4225826..ec5ddc9 100644
--- a/php-zetacomponents-base.spec
+++ b/php-zetacomponents-base.spec
@@ -17,7 +17,7 @@
Name: php-%{gh_owner}-%{cname}
Version: 1.9
-Release: 2%{?dist}
+Release: 6%{?dist}
Summary: Zeta Base Component
Group: Development/Libraries
@@ -29,8 +29,9 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
Patch0: %{name}-layout.patch
# Upstream
Patch1: %{name}-upstream.patch
+# For PHP 7.2
+Patch2: %{name}-pr8.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{_bindir}/phpab
%if %{with_tests}
@@ -61,6 +62,7 @@ autoload support.
%patch0 -p0
%patch1 -p1
+%patch2 -p1
%build
@@ -71,7 +73,6 @@ autoload support.
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{ezcdir}/autoload
: The library
@@ -96,18 +97,19 @@ require '$PWD/src/autoloader.php';
EOF
: Run test test suite
-%{_bindir}/phpunit
+ret=0
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit || ret=1
+ fi
+done
+exit $ret
%else
: Test suite disabled
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE* CREDITS
%doc ChangeLog
@@ -120,9 +122,13 @@ rm -rf %{buildroot}
%changelog
+* Mon Oct 30 2017 Remi Collet <remi@fedoraproject.org> - 1.9-6
+- fix FTBFS from Koschei, add patch for tests from
+ https://github.com/zetacomponents/Base/pull/8
+
* Thu Jun 4 2015 Remi Collet <remi@fedoraproject.org> - 1.9-2
- add upstream patch for LICENSE file
* Wed Jun 3 2015 Remi Collet <remi@fedoraproject.org> - 1.9-1
- initial package
-- open https://github.com/zetacomponents/UnitTest/issues/4 License \ No newline at end of file
+- open https://github.com/zetacomponents/UnitTest/issues/4 License