diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | composer-dev.json | 39 | ||||
| -rw-r--r-- | composer.json | 15 | ||||
| -rw-r--r-- | php-nette-robot-loader-dev.spec | 178 | ||||
| -rw-r--r-- | php-nette-robot-loader.spec | 60 |
5 files changed, 60 insertions, 239 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index 6f2fa1c..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "nette/robot-loader", - "description": "Nette RobotLoader: comfortable autoloading", - "homepage": "https://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.6.0", - "ext-tokenizer": "*", - "nette/caching": "~2.2", - "nette/finder": "~2.3", - "nette/utils": "~2.4" - }, - "require-dev": { - "nette/tester": "~2.0", - "tracy/tracy": "^2.3" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "autoload": { - "classmap": ["src/"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - } -} diff --git a/composer.json b/composer.json index 92d3d12..6f2fa1c 100644 --- a/composer.json +++ b/composer.json @@ -14,13 +14,15 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", + "ext-tokenizer": "*", "nette/caching": "~2.2", "nette/finder": "~2.3", - "nette/utils": "~2.2" + "nette/utils": "~2.4" }, "require-dev": { - "nette/tester": "~1.4" + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" }, "conflict": { "nette/nette": "<2.2" @@ -28,5 +30,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-robot-loader-dev.spec b/php-nette-robot-loader-dev.spec deleted file mode 100644 index bcfa922..0000000 --- a/php-nette-robot-loader-dev.spec +++ /dev/null @@ -1,178 +0,0 @@ -# remirepo/fedora spec file for php-nette-robot-loader -# -# 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 f23f8885624b249d5ec7bb525b9d6b007ab00293 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project robot-loader -%global ns_vendor Nette -%global ns_project RobotLoader -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.4.2 -%global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Nette RobotLoader: comfortable autoloading - -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 - -# Ensure TEMP_DIR exists -Patch0: %{name}-rpm.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: php-composer(theseer/autoload) -%if %{with_tests} -BuildRequires: php(language) >= 5.6 -BuildRequires: php-tokenizer -BuildRequires: php-composer(%{gh_owner}/caching) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/finder) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -BuildRequires: php-pcre -BuildRequires: php-phar -BuildRequires: php-spl -# From composer.json, "require-dev": { -# "nette/tester": "~2.0", -# "tracy/tracy": "^2.3" -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -BuildRequires: php-composer(tracy/tracy) >= 2.3 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0" -# "ext-tokenizer": "*", -# "nette/caching": "~2.2", -# "nette/finder": "~2.3", -# "nette/utils": "~2.4" -Requires: php(language) >= 5.6 -Requires: php-tokenizer -Requires: php-composer(%{gh_owner}/caching) >= 2.2 -Requires: php-composer(%{gh_owner}/caching) < 3 -Requires: php-composer(%{gh_owner}/finder) >= 2.3 -Requires: php-composer(%{gh_owner}/finder) < 3 -Requires: php-composer(%{gh_owner}/utils) >= 2.4 -Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.4.1 -Requires: php-pcre -Requires: php-spl - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -RobotLoader is a tool that gives you comfort of automated class loading -for your entire application including third-party libraries. - -- get rid of all require -- only necessary scripts are loaded -- requires no strict file naming conventions -- allows more classes in single file - -To use this library, you just have to add, in your project: - require_once '%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - -%patch0 -p0 -b .rpm - - -%build -: Generate a classmap autoloader -phpab --output src/%{ns_project}/autoload.php src - -cat << 'EOF' | tee -a src/%{ns_project}/autoload.php -// Dependencies -require_once '%{php_home}/%{ns_vendor}/Caching/autoload.php'; -require_once '%{php_home}/%{ns_vendor}/Finder/autoload.php'; -require_once '%{php_home}/%{ns_vendor}/Utils/autoload.php'; -EOF - - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{php_home}/%{ns_vendor} -cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ - - -%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 '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/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 -s || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/nette-tester --colors 0 -p php -C 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}/%{ns_project} - - -%changelog -* Wed Jan 4 2017 Remi Collet <remi@fedoraproject.org> - 2.4.2-1 -- update to 2.4.2 - -* Fri Oct 28 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1 -- update to 2.4.1 - -* Thu Aug 4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1 -- update to 2.4.0 -- raise dependency on PHP >= 5.6 -- raise dependency on nette/utils >= 2.4 - -* Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.2-1 -- update to 2.3.2 - -* Tue Nov 3 2015 Remi Collet <remi@fedoraproject.org> - 2.3.1-2 -- fix package summary - -* Fri Oct 30 2015 Remi Collet <remi@fedoraproject.org> - 2.3.1-1 -- initial package diff --git a/php-nette-robot-loader.spec b/php-nette-robot-loader.spec index 82ec9af..bcfa922 100644 --- a/php-nette-robot-loader.spec +++ b/php-nette-robot-loader.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 0dbed866df47fd0425ce9a3cc9085779d8ada143 +%global gh_commit f23f8885624b249d5ec7bb525b9d6b007ab00293 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -17,7 +17,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.2 +Version: 2.4.2 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette RobotLoader: comfortable autoloading @@ -36,31 +36,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.6 +BuildRequires: php-tokenizer BuildRequires: php-composer(%{gh_owner}/caching) >= 2.2 BuildRequires: php-composer(%{gh_owner}/finder) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 BuildRequires: php-pcre BuildRequires: php-phar BuildRequires: php-spl # From composer.json, "require-dev": { -# "nette/tester": "~1.4" -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.4 +# "nette/tester": "~2.0", +# "tracy/tracy": "^2.3" +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(tracy/tracy) >= 2.3 %endif # from composer.json, "require": { -# "php": ">=5.3.1" +# "php": ">=5.6.0" +# "ext-tokenizer": "*", # "nette/caching": "~2.2", # "nette/finder": "~2.3", -# "nette/utils": "~2.2" -Requires: php(language) >= 5.3.1 +# "nette/utils": "~2.4" +Requires: php(language) >= 5.6 +Requires: php-tokenizer Requires: php-composer(%{gh_owner}/caching) >= 2.2 Requires: php-composer(%{gh_owner}/caching) < 3 Requires: php-composer(%{gh_owner}/finder) >= 2.3 Requires: php-composer(%{gh_owner}/finder) < 3 -Requires: php-composer(%{gh_owner}/utils) >= 2.2 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.1 +# from phpcompatinfo report for version 2.4.1 Requires: php-pcre Requires: php-spl @@ -106,8 +111,6 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ %check %if %{with_tests} -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -119,12 +122,22 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree -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 -s || ret=1 + run=1 +fi +if [ $run -eq 0 ]; then +%{_bindir}/nette-tester --colors 0 -p php -C tests -s +# remirepo:2 fi +exit $ret %else : Test suite disabled %endif @@ -144,6 +157,17 @@ rm -rf %{buildroot} %changelog +* Wed Jan 4 2017 Remi Collet <remi@fedoraproject.org> - 2.4.2-1 +- update to 2.4.2 + +* Fri Oct 28 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1 +- update to 2.4.1 + +* Thu Aug 4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1 +- update to 2.4.0 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 + * Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.2-1 - update to 2.3.2 |