From ffc3d21ee85948d870c6c46dbcd77d2dadda6654 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 09:36:47 +0200 Subject: switch --- .gitignore | 7 ++ composer-dev.json | 37 --------- composer.json | 17 ++-- php-nette-component-model-dev.spec | 158 ------------------------------------- php-nette-component-model.spec | 49 +++++++++--- 5 files changed, 55 insertions(+), 213 deletions(-) create mode 100644 .gitignore delete mode 100644 composer-dev.json delete mode 100644 php-nette-component-model-dev.spec 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 bb43bda..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "nette/component-model", - "description": "Nette Component Model", - "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", - "nette/utils": "^2.4" - }, - "require-dev": { - "nette/tester": "~2.0", - "tracy/tracy": "^2.3" - }, - "conflict": { - "nette/nette": "<2.2", - "nette/application": "<2.4" - }, - "autoload": { - "classmap": ["src/"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - } -} diff --git a/composer.json b/composer.json index a49ef8f..bb43bda 100644 --- a/composer.json +++ b/composer.json @@ -14,17 +14,24 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "^2.3.5" + "php": ">=5.6.0", + "nette/utils": "^2.4" }, "require-dev": { - "nette/tester": "~1.3" + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" }, "conflict": { - "nette/nette": "<2.2" + "nette/nette": "<2.2", + "nette/application": "<2.4" }, "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + } } diff --git a/php-nette-component-model-dev.spec b/php-nette-component-model-dev.spec deleted file mode 100644 index f748f33..0000000 --- a/php-nette-component-model-dev.spec +++ /dev/null @@ -1,158 +0,0 @@ -# remirepo/fedora spec file for php-nette-component-model -# -# 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 9b5817b246bf409b8f0f8309c23e599dd8729d28 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project component-model -%global ns_vendor Nette -%global ns_project ComponentModel -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.0 -%global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Nette Component Model - -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.6 -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -# From composer.json, "require-dev": { -# "nette/tester": "~2.0", -# "tracy/tracy": "^2.3" -# ignore tracy (pass without) -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0", -# "nette/utils": "^2.4" -Requires: php(language) >= 5.6 -Requires: php-composer(%{gh_owner}/utils) >= 2.4 -Requires: php-composer(%{gh_owner}/utils) < 3 -# from composer.json, "conflict": { -Conflicts: php-composer(%{gh_owner}/application) < 2.4 -# from phpcompatinfo report for version 2.2.4 -Requires: php-pcre -Requires: php-spl - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Components are the foundation of reusable code. They make your work easier -and allow you to profit from community work. Components are wonderful. -Nette Framework introduces several classes and interfaces for all these -types of components. - -Object inheritance allows us to have a hierarchic structure of classes like -in real world. We can create new classes by extending. These extended classes -are descendants of the original class and inherit its parameters and methods. -Extended class can add its own parameters and methods to the inherited ones. - -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} - - -%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}/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} -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php -php.ini - php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1 - run=1 -fi -if which php71; then - cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini - php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini 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 -%doc composer.json -%{php_home}/%{ns_vendor}/%{ns_project} - - -%changelog -* Tue Aug 2 2016 Remi Collet - 2.3.0-1 -- update to 2.3.0 -- raise dependency on PHP >= 5.6 -- raise dependency on nette/utils >= 2.4 - -* Tue Nov 3 2015 Remi Collet - 2.2.4-2 -- fix package description and summary - -* Tue Oct 20 2015 Remi Collet - 2.2.4-1 -- initial package diff --git a/php-nette-component-model.spec b/php-nette-component-model.spec index c659e75..f748f33 100644 --- a/php-nette-component-model.spec +++ b/php-nette-component-model.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit fb232ed9ccd90873625bfdcc115c406e3ab34ebb +%global gh_commit 9b5817b246bf409b8f0f8309c23e599dd8729d28 #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.2.5 +Version: 2.3.0 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Component Model @@ -33,21 +33,25 @@ 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-pcre BuildRequires: php-reflection -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.3.5 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 # 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" +# ignore tracy (pass without) +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -# "nette/utils": "^2.3.5" -Requires: php(language) >= 5.3.1 -Requires: php-composer(%{gh_owner}/utils) >= 2.3.5 +# "php": ">=5.6.0", +# "nette/utils": "^2.4" +Requires: php(language) >= 5.6 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 Requires: php-composer(%{gh_owner}/utils) < 3 +# from composer.json, "conflict": { +Conflicts: php-composer(%{gh_owner}/application) < 2.4 # from phpcompatinfo report for version 2.2.4 Requires: php-pcre Requires: php-spl @@ -105,7 +109,24 @@ 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 +# remirepo:13 +ret=0 +run=0 +if which php56; then + cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini + php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1 + run=1 +fi +if which php71; then + cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini + php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1 + run=1 +fi +if [ $run -eq 0 ]; then +%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s +# remirepo:2 +fi +exit $ret %else : Test suite disabled %endif @@ -125,8 +146,10 @@ rm -rf %{buildroot} %changelog -* Wed Dec 21 2016 Remi Collet - 2.2.5-1 -- update to 2.2.5 +* Tue Aug 2 2016 Remi Collet - 2.3.0-1 +- update to 2.3.0 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 * Tue Nov 3 2015 Remi Collet - 2.2.4-2 - fix package description and summary -- cgit