From 03ed9cefd048976c0e4cfd74de0489034ac81f93 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 09:33:16 +0200 Subject: switch --- .gitignore | 7 ++ composer-dev.json | 36 --------- composer.json | 14 +++- php-nette-php-generator-dev.spec | 160 --------------------------------------- php-nette-php-generator.spec | 65 +++++++++++----- 5 files changed, 63 insertions(+), 219 deletions(-) create mode 100644 .gitignore delete mode 100644 composer-dev.json delete mode 100644 php-nette-php-generator-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 939aea9..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "nette/php-generator", - "description": "Nette PHP Generator", - "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.2 || ~3.0.0" - }, - "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.6-dev" - } - } -} diff --git a/composer.json b/composer.json index 0a75880..939aea9 100644 --- a/composer.json +++ b/composer.json @@ -14,11 +14,12 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/utils": "^2.4.2 || ~3.0.0" }, "require-dev": { - "nette/tester": "~1.4" + "nette/tester": "^2.0", + "tracy/tracy": "^2.3" }, "conflict": { "nette/nette": "<2.2" @@ -26,5 +27,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + } } diff --git a/php-nette-php-generator-dev.spec b/php-nette-php-generator-dev.spec deleted file mode 100644 index 6d32b71..0000000 --- a/php-nette-php-generator-dev.spec +++ /dev/null @@ -1,160 +0,0 @@ -# remirepo/fedora spec file for php-nette-php-generator -# -# 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 3a69f606db7f1e9995347c7d84b9d2a0507c0b38 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project php-generator -%global ns_vendor Nette -%global ns_project PhpGenerator -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.2 -%global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Nette PHP Generator - -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.2 -# 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.2 || ~3.0.0" -Requires: php(language) >= 5.6 -Requires: php-composer(%{gh_owner}/utils) >= 2.4.2 -Requires: php-composer(%{gh_owner}/utils) < 4 -# from phpcompatinfo report for version 2.3.4 -Requires: php-pcre -Requires: php-reflection - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Generate PHP code with a simple programmatical API. - -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} -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - - 2.6.2-1 -- Update to 2.6.2 - -* Wed Mar 15 2017 Remi Collet - 2.6.1-1 -- Update to 2.6.1 - -* Sun Feb 26 2017 Remi Collet - 2.6.0-1 -- update to 2.6.0 - -* Sun Jan 15 2017 Remi Collet - 2.5.0-1 -- update to 2.5.0 - -* Tue Aug 2 2016 Remi Collet - 2.4.1-1 -- update to 2.4.1 -- raise dependency on PHP >= 5.6 -- raise dependency on nette/utils >= 2.4 - -* Mon Jun 20 2016 Remi Collet - 2.3.6-1 -- update to 2.3.6 - -* Thu Dec 3 2015 Remi Collet - 2.3.5-1 -- update to 2.3.5 -- run test suite with both php 5 and 7 when available - -* Tue Oct 20 2015 Remi Collet - 2.3.4-1 -- initial package diff --git a/php-nette-php-generator.spec b/php-nette-php-generator.spec index 15b4d86..6d32b71 100644 --- a/php-nette-php-generator.spec +++ b/php-nette-php-generator.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit bbc8189aa54af093c908d98212e1c309b9170345 +%global gh_commit 3a69f606db7f1e9995347c7d84b9d2a0507c0b38 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -17,9 +17,9 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.6 +Version: 2.6.2 %global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette PHP Generator Group: Development/Libraries @@ -33,21 +33,23 @@ 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.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4.2 # 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.2" -Requires: php(language) >= 5.3.1 -Requires: php-composer(%{gh_owner}/utils) >= 2.2 -Requires: php-composer(%{gh_owner}/utils) < 3 +# "php": ">=5.6.0", +# "nette/utils": "^2.4.2 || ~3.0.0" +Requires: php(language) >= 5.6 +Requires: php-composer(%{gh_owner}/utils) >= 2.4.2 +Requires: php-composer(%{gh_owner}/utils) < 4 # from phpcompatinfo report for version 2.3.4 Requires: php-pcre Requires: php-reflection @@ -84,8 +86,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 @@ -97,12 +97,22 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/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 -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 @@ -122,6 +132,23 @@ rm -rf %{buildroot} %changelog +* Mon Mar 20 2017 Remi Collet - 2.6.2-1 +- Update to 2.6.2 + +* Wed Mar 15 2017 Remi Collet - 2.6.1-1 +- Update to 2.6.1 + +* Sun Feb 26 2017 Remi Collet - 2.6.0-1 +- update to 2.6.0 + +* Sun Jan 15 2017 Remi Collet - 2.5.0-1 +- update to 2.5.0 + +* Tue Aug 2 2016 Remi Collet - 2.4.1-1 +- update to 2.4.1 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 + * Mon Jun 20 2016 Remi Collet - 2.3.6-1 - update to 2.3.6 -- cgit