diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | php-nette-tokenizer.spec | 17 | 
2 files changed, 18 insertions, 8 deletions
diff --git a/composer.json b/composer.json index 5b1f6c3..5ed3776 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@  		}  	],  	"require": { -		"php": ">=5.3.1" +		"php": ">=5.4"  	},  	"require-dev": {  		"nette/tester": "~1.7", @@ -26,5 +26,10 @@  	"autoload": {  		"classmap": ["src/"]  	}, -	"minimum-stability": "dev" +	"minimum-stability": "dev", +	"extra": { +		"branch-alias": { +			"dev-master": "2.3-dev" +		} +	}  } diff --git a/php-nette-tokenizer.spec b/php-nette-tokenizer.spec index 009b02d..3f2d211 100644 --- a/php-nette-tokenizer.spec +++ b/php-nette-tokenizer.spec @@ -6,7 +6,7 @@  #  # Please, preserve the changelog entries  # -%global gh_commit    ac9978efdb8add01ad9497b26bb90181cb0a4c1e +%global gh_commit    88373e9f79007245af0ccd8132fde117421723b2  #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.4 +Version:        2.3.0  %global specrel 1  Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}  Summary:        Nette Tokenizer @@ -32,7 +32,7 @@ Source1:        makesrc.sh  BuildArch:      noarch  BuildRequires:  php-composer(theseer/autoload)  %if %{with_tests} -BuildRequires:  php(language) >= 5.3.1 +BuildRequires:  php(language) >= 5.4  BuildRequires:  php-pcre  # From composer.json, "require-dev": {  #       "nette/tester": "~1.7", @@ -42,9 +42,9 @@ BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.7  %endif  # from composer.json, "require": { -#        "php": ">=5.3.1" -Requires:       php(language) >= 5.3.1 -# from phpcompatinfo report for version 2.2.1 +#        "php": ">=5.4" +Requires:       php(language) >= 5.4 +# from phpcompatinfo report for version 2.3.0  Requires:       php-pcre  Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -110,9 +110,14 @@ exit $ret  %doc composer.json  %dir %{php_home}/%{ns_vendor}       %{php_home}/%{ns_vendor}/%{ns_project} +     %{php_home}/%{ns_vendor}/Utils  %changelog +* Sat Sep  9 2017 Remi Collet <remi@remirepo.net> - 2.3.0-1 +- Update to 2.3.0 +- raise minimal PHP version to 5.4 +  * Sat Aug  5 2017 Remi Collet <remi@remirepo.net> - 2.2.4-1  - Update to 2.2.4  | 
