diff options
| -rw-r--r-- | composer-dev.json | 36 | ||||
| -rw-r--r-- | composer.json | 13 | ||||
| -rw-r--r-- | php-tracy-dev.spec | 198 | ||||
| -rw-r--r-- | php-tracy.spec | 67 |
4 files changed, 57 insertions, 257 deletions
diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index 95d4d41..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "tracy/tracy", - "description": "Tracy: useful PHP debugger", - "keywords": ["debug", "debugger", "nette"], - "homepage": "https://tracy.nette.org", - "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "require": { - "php": ">=5.4.4", - "ext-session": "*", - "ext-json": "*" - }, - "require-dev": { - "nette/di": "~2.3", - "nette/tester": "~2.0" - }, - "autoload": { - "classmap": ["src"], - "files": ["src/shortcuts.php"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - } -} diff --git a/composer.json b/composer.json index 2336955..95d4d41 100644 --- a/composer.json +++ b/composer.json @@ -15,15 +15,22 @@ } ], "require": { - "php": ">=5.3.1" + "php": ">=5.4.4", + "ext-session": "*", + "ext-json": "*" }, "require-dev": { "nette/di": "~2.3", - "nette/tester": "~1.3" + "nette/tester": "~2.0" }, "autoload": { "classmap": ["src"], "files": ["src/shortcuts.php"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-tracy-dev.spec b/php-tracy-dev.spec deleted file mode 100644 index a939dbd..0000000 --- a/php-tracy-dev.spec +++ /dev/null @@ -1,198 +0,0 @@ -# remirepo/fedora spec file for php-tracy -# -# Copyright (c) 2015-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global gh_commit c9fbca15b0a11d904c7783b7aad114182618d8d4 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project tracy -%global ns_vendor Tracy -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_project} -Version: 2.4.6 -%global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Tracy: useful PHP debugger - -Group: Development/Libraries -License: BSD or GPLv2 or GPLv3 -URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz -# pull a git snapshot to get test sutie -Source1: makesrc.sh - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: php-composer(theseer/autoload) -%if %{with_tests} -BuildRequires: php(language) >= 5.4.4 -BuildRequires: php-session -BuildRequires: php-json -BuildRequires: php-date -BuildRequires: php-iconv -BuildRequires: php-pcre -BuildRequires: php-posix -BuildRequires: php-reflection -BuildRequires: php-spl -# From composer.json, "require-dev": { -# "nette/di": "~2.3", -# "nette/tester": "~2.0" -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -%endif - -# from composer.json, "require": { -# "php": ">=5.4.4", -# "ext-session": "*", -# "ext-json": "*" -Requires: php(language) >= 5.4.4 -Requires: php-session -Requires: php-json -# from phpcompatinfo report for version 2.3.5, XDebug is optional -Requires: php-date -Requires: php-iconv -Requires: php-pcre -Requires: php-posix -Requires: php-reflection -Requires: php-spl - -# provides tracy/tracy -Provides: php-composer(%{gh_project}/%{gh_project}) = %{version} - - -%description -Tracy library is a useful PHP everyday programmer's helper. It helps you to: - -- quickly detect and correct errors -- log errors -- dump variables -- measure the time - -To use this library, you just have to add, in your project: - require_once '%{php_home}/%{ns_vendor}/autoload.php'; - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - -# drop upstream autoloader which is outside tree -rm src/tracy.php -# move -mv src/shortcuts.php src/%{ns_vendor} -mv src/Bridges src/%{ns_vendor} - - -%build -: Generate a classmap autoloader -phpab --output src/%{ns_vendor}/autoload.php src - -cat << 'EOF' | tee -a src/%{ns_vendor}/autoload.php -require_once __DIR__ . '/shortcuts.php'; -EOF - - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{php_home} -cp -pr src/* %{buildroot}%{php_home}/ - - -%check -%if %{with_tests} -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php -<?php -require_once '%{php_home}/Tester/autoload.php'; -require_once '%{php_home}/Nette/DI/autoload.php'; -require_once '%{buildroot}%{php_home}/%{ns_vendor}/autoload.php'; -EOF - -: Run test suite in sources tree -# remirepo:11 -ret=0 -run=0 -if which php56; then - php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -d serialize_precision=14 -s || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/nette-tester --colors 0 -p php -C -d serialize_precision=14 tests -s -# remirepo:2 -fi -exit $ret -%else -: Test suite disabled -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license license.md -%doc readme.md contributing.md -%doc composer.json -%{php_home}/%{ns_vendor} - - -%changelog -* Mon Jan 30 2017 Remi Collet <remi@fedoraproject.org> - 2.4.6-1 -- update to 2.4.6 - -* Sun Jan 15 2017 Remi Collet <remi@fedoraproject.org> - 2.4.5-1 -- update to 2.4.5 - -* Sat Dec 10 2016 Remi Collet <remi@fedoraproject.org> - 2.4.4-1 -- update to 2.4.4 - -* Wed Nov 23 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-2 -- set serialize_precision=14, fix FTBFS with php 7.1 - -* Fri Sep 30 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-1 -- update to 2.4.3 - -* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1 -- update to 2.4.2 -- raise dependency on PHP >= 5.4.4 - -* Mon May 30 2016 Remi Collet <remi@fedoraproject.org> - 2.3.11-1 -- update to 2.3.11 - -* Mon Feb 29 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1 -- update to 2.3.10 - -* Mon Feb 22 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1 -- update to 2.3.9 - -* Sun Feb 14 2016 Remi Collet <remi@fedoraproject.org> - 2.3.8-2 -- add upstream patch for new PHP - -* Wed Jan 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.8-1 -- update to 2.3.8 -- run test suite with both php 5 and 7 when available - -* Mon Nov 30 2015 Remi Collet <remi@fedoraproject.org> - 2.3.7-1 -- update to 2.3.7 - -* Thu Oct 29 2015 Remi Collet <remi@fedoraproject.org> - 2.3.6-1 -- update to 2.3.6 - -* Tue Oct 20 2015 Remi Collet <remi@fedoraproject.org> - 2.3.5-1 -- initial package diff --git a/php-tracy.spec b/php-tracy.spec index a822684..a939dbd 100644 --- a/php-tracy.spec +++ b/php-tracy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 152b7602115dd3a66f3190280951390097a15f65 +%global gh_commit c9fbca15b0a11d904c7783b7aad114182618d8d4 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -16,7 +16,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.3.11 +Version: 2.4.6 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Tracy: useful PHP debugger @@ -32,36 +32,36 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-composer(theseer/autoload) %if %{with_tests} -BuildRequires: php(language) >= 5.3.1 +BuildRequires: php(language) >= 5.4.4 +BuildRequires: php-session +BuildRequires: php-json BuildRequires: php-date BuildRequires: php-iconv -BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-posix BuildRequires: php-reflection -BuildRequires: php-session BuildRequires: php-spl -BuildRequires: php-xml # From composer.json, "require-dev": { # "nette/di": "~2.3", -# "nette/tester": "~1.3" +# "nette/tester": "~2.0" BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -Requires: php(language) >= 5.3.1 +# "php": ">=5.4.4", +# "ext-session": "*", +# "ext-json": "*" +Requires: php(language) >= 5.4.4 +Requires: php-session +Requires: php-json # from phpcompatinfo report for version 2.3.5, XDebug is optional Requires: php-date Requires: php-iconv -Requires: php-json Requires: php-pcre Requires: php-posix Requires: php-reflection -Requires: php-session Requires: php-spl -Requires: php-xml # provides tracy/tracy Provides: php-composer(%{gh_project}/%{gh_project}) = %{version} @@ -106,8 +106,6 @@ cp -pr src/* %{buildroot}%{php_home}/ %check %if %{with_tests} -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -120,12 +118,22 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/autoload.php'; EOF : Run test suite in sources tree -%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s - -if which php70; then - cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini - php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s +# remirepo:11 +ret=0 +run=0 +if which php56; then + php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1 + run=1 fi +if which php71; then + php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -d serialize_precision=14 -s || ret=1 + run=1 +fi +if [ $run -eq 0 ]; then +%{_bindir}/nette-tester --colors 0 -p php -C -d serialize_precision=14 tests -s +# remirepo:2 +fi +exit $ret %else : Test suite disabled %endif @@ -145,6 +153,25 @@ rm -rf %{buildroot} %changelog +* Mon Jan 30 2017 Remi Collet <remi@fedoraproject.org> - 2.4.6-1 +- update to 2.4.6 + +* Sun Jan 15 2017 Remi Collet <remi@fedoraproject.org> - 2.4.5-1 +- update to 2.4.5 + +* Sat Dec 10 2016 Remi Collet <remi@fedoraproject.org> - 2.4.4-1 +- update to 2.4.4 + +* Wed Nov 23 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-2 +- set serialize_precision=14, fix FTBFS with php 7.1 + +* Fri Sep 30 2016 Remi Collet <remi@fedoraproject.org> - 2.4.3-1 +- update to 2.4.3 + +* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1 +- update to 2.4.2 +- raise dependency on PHP >= 5.4.4 + * Mon May 30 2016 Remi Collet <remi@fedoraproject.org> - 2.3.11-1 - update to 2.3.11 |