From 1742fa79c9bd8be6823dd6dcc73e59acdd7ed6f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 09:53:24 +0200 Subject: switch --- .gitignore | 7 +++ composer-dev.json | 41 ------------ composer.json | 16 +++-- php-nette-mail-dev.spec | 161 ------------------------------------------------ php-nette-mail.spec | 62 ++++++++++++------- 5 files changed, 58 insertions(+), 229 deletions(-) create mode 100644 .gitignore delete mode 100644 composer-dev.json delete mode 100644 php-nette-mail-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 d8dca7c..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "nette/mail", - "description": "Nette Mail: Sending E-mails", - "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-iconv": "*", - "nette/utils": "^2.4 || ~3.0.0" - }, - "require-dev": { - "nette/di": "^2.4 || ~3.0.0", - "nette/tester": "^2.0", - "tracy/tracy": "^2.4" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "suggest": { - "ext-fileinfo": "to detect type of attached files" - }, - "autoload": { - "classmap": ["src/"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - } -} diff --git a/composer.json b/composer.json index a138339..d8dca7c 100644 --- a/composer.json +++ b/composer.json @@ -14,13 +14,14 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", "ext-iconv": "*", - "nette/utils": "~2.2" + "nette/utils": "^2.4 || ~3.0.0" }, "require-dev": { - "nette/di": "~2.3", - "nette/tester": "~1.3" + "nette/di": "^2.4 || ~3.0.0", + "nette/tester": "^2.0", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" @@ -31,5 +32,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-mail-dev.spec b/php-nette-mail-dev.spec deleted file mode 100644 index b3f4830..0000000 --- a/php-nette-mail-dev.spec +++ /dev/null @@ -1,161 +0,0 @@ -# remirepo/fedora spec file for php-nette-mail -# -# 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 2bb0333200dbec22b0c1868d907e3e451b555665 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project mail -%global ns_vendor Nette -%global ns_project Mail -%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 Mail: Sending E-mails - -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-iconv -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -BuildRequires: php-date -BuildRequires: php-fileinfo -BuildRequires: php-pcre -# From composer.json, "require-dev": { -# "nette/di": "^2.4 || ~3.0.0", -# "nette/tester": "^2.0", -# "tracy/tracy": "^2.4" -BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -BuildRequires: php-composer(tracy/tracy) >= 2.4 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0" -# "ext-iconv": "*", -# "nette/utils": "^2.4 || ~3.0.0" -Requires: php(language) >= 5.6 -Requires: php-iconv -Requires: php-composer(%{gh_owner}/utils) >= 2.4 -Requires: php-composer(%{gh_owner}/utils) < 4 -# from phpcompatinfo report for version 2.4.0 -Requires: php-date -Requires: php-fileinfo -Requires: php-pcre - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Almost every web application needs to send e-mails, whether newsletters -or order confirmations. That's why Nette Framework provides necessary tools. - -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.4.2-1 -- update to 2.4.2 - -* Thu Aug 4 2016 Remi Collet - 2.4.1-1 -- update to 2.4.1 -- raise dependency on PHP >= 5.6 -- raise dependency on nette/di >= 2.4 -- raise dependency on nette/utils >= 2.4 - -* Thu Apr 14 2016 Remi Collet - 2.3.5-1 -- update to 2.3.5 - -* Mon Nov 30 2015 Remi Collet - 2.3.4-1 -- update to 2.3.4 - -* Fri Oct 30 2015 Remi Collet - 2.3.3-1 -- initial package diff --git a/php-nette-mail.spec b/php-nette-mail.spec index 59239b8..b3f4830 100644 --- a/php-nette-mail.spec +++ b/php-nette-mail.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 44491710d30db970e731c3908c491d061a0e22df +%global gh_commit 2bb0333200dbec22b0c1868d907e3e451b555665 #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.5 +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 Mail: Sending E-mails @@ -33,28 +33,30 @@ 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-iconv -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 BuildRequires: php-date BuildRequires: php-fileinfo BuildRequires: php-pcre # From composer.json, "require-dev": { -# "nette/di": "~2.3", -# "nette/tester": "~1.3" -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 +# "nette/di": "^2.4 || ~3.0.0", +# "nette/tester": "^2.0", +# "tracy/tracy": "^2.4" +BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(tracy/tracy) >= 2.4 %endif # from composer.json, "require": { -# "php": ">=5.3.1" +# "php": ">=5.6.0" # "ext-iconv": "*", -# "nette/utils": "~2.2" -Requires: php(language) >= 5.3.1 +# "nette/utils": "^2.4 || ~3.0.0" +Requires: php(language) >= 5.6 Requires: php-iconv -Requires: php-composer(%{gh_owner}/utils) >= 2.2 -Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.3 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 +Requires: php-composer(%{gh_owner}/utils) < 4 +# from phpcompatinfo report for version 2.4.0 Requires: php-date Requires: php-fileinfo Requires: php-pcre @@ -92,8 +94,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 @@ -106,13 +106,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 - -# remirepo:4 -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 +run=0 +ret=0 +if which php56; then + php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s + run=1 +fi +if which php71; then + php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -s + 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 @@ -133,6 +142,15 @@ rm -rf %{buildroot} %changelog +* Sun Feb 26 2017 Remi Collet - 2.4.2-1 +- update to 2.4.2 + +* Thu Aug 4 2016 Remi Collet - 2.4.1-1 +- update to 2.4.1 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/di >= 2.4 +- raise dependency on nette/utils >= 2.4 + * Thu Apr 14 2016 Remi Collet - 2.3.5-1 - update to 2.3.5 -- cgit