From 1626cab82826d919e306dd51ea228f3ab8465e19 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 10:48:01 +0200 Subject: switch --- .gitignore | 7 ++ composer-dev.json | 40 ---------- composer.json | 18 +++-- php-nette-database-dev.spec | 187 -------------------------------------------- php-nette-database.spec | 62 +++++++++------ 5 files changed, 55 insertions(+), 259 deletions(-) create mode 100644 .gitignore delete mode 100644 composer-dev.json delete mode 100644 php-nette-database-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 f7b1268..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "nette/database", - "description": "Nette Database Component", - "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-pdo": "*", - "nette/caching": "^2.2", - "nette/utils": "^2.4 || ~3.0.0" - }, - "require-dev": { - "nette/tester": "^2.0", - "nette/di": "^2.4 || ~3.0.0", - "mockery/mockery": "^1.0.0", - "tracy/tracy": "^2.4" - }, - "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 153ed1f..f7b1268 100644 --- a/composer.json +++ b/composer.json @@ -14,15 +14,16 @@ } ], "require": { - "php": ">=5.3.1", + "php": ">=5.6.0", "ext-pdo": "*", "nette/caching": "^2.2", - "nette/utils": "^2.3.5" + "nette/utils": "^2.4 || ~3.0.0" }, "require-dev": { - "nette/tester": "^1.3", - "nette/di": "^2.3", - "mockery/mockery": "^0.9.1" + "nette/tester": "^2.0", + "nette/di": "^2.4 || ~3.0.0", + "mockery/mockery": "^1.0.0", + "tracy/tracy": "^2.4" }, "conflict": { "nette/nette": "<2.2" @@ -30,5 +31,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } diff --git a/php-nette-database-dev.spec b/php-nette-database-dev.spec deleted file mode 100644 index 563af15..0000000 --- a/php-nette-database-dev.spec +++ /dev/null @@ -1,187 +0,0 @@ -# remirepo/fedora spec file for php-nette-database -# -# 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 debc7db9f4d7ffff71e2c3a81f841fbcbab4610d -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project database -%global ns_vendor Nette -%global ns_project Database -%global php_home %{_datadir}/php -%if 0%{?rhel} == 6 -# mockery is too old -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif - -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 Database Component - -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-pdo -BuildRequires: php-composer(%{gh_owner}/caching) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -BuildRequires: php-date -BuildRequires: php-json -BuildRequires: php-pcre -BuildRequires: php-spl -# From composer.json, "require-dev": { -# "nette/tester": "^2.0", -# "nette/di": "^2.4 || ~3.0.0", -# "mockery/mockery": "^1.0.0", -# "tracy/tracy": "^2.4" -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 -# version 1.0.0 is not released -BuildRequires: php-composer(mockery/mockery) >= 0.9.1 -BuildRequires: php-composer(tracy/tracy) >= 2.3 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0" -# "ext-pdo": "*", -# "nette/caching": "^2.2", -# "nette/utils": "^2.4 || ~3.0.0" -Requires: php(language) >= 5.6 -Requires: php-pdo -Requires: php-composer(%{gh_owner}/caching) >= 2.2 -Requires: php-composer(%{gh_owner}/caching) < 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-json -Requires: php-pcre -Requires: php-spl - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Nette provides a powerful layer for accessing your database easily. - -- composes SQL queries with ease -- easily fetches data -- uses efficient queries and does not transmit unnecessary data - -The Nette\Database\Connection class is a wrapper around the PDO -and represents a connection to the database. The core functionality -is provided by Nette\Database\Context. Nette\Database\Table layer -provides an enhanced layer for table querying. - -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}/Caching/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 - -%if 0%{?rhel} != 5 -: Generate minimal Sqlite condiguration -cat << 'EOF' | tee tests/Database/databases.ini -[sqlite] -dsn = "sqlite::memory:" -EOF -%endif - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - - 2.4.2-1 -- update to 2.4.2 - -* Wed Oct 19 2016 Remi Collet - 2.4.1-1 -- update to 2.4.1 - -* Thu Aug 4 2016 Remi Collet - 2.4.0-1 -- update to 2.4.0 -- raise dependency on PHP >= 5.6 -- raise dependency on nette/utils >= 2.4 - -* Wed Jun 1 2016 Remi Collet - 2.3.9-1 -- update to 2.3.9 - -* Thu Dec 3 2015 Remi Collet - 2.3.8-1 -- update to 2.3.8 -- run test suite with both php 5 and 7 when available - -* Fri Oct 30 2015 Remi Collet - 2.3.7-1 -- initial package diff --git a/php-nette-database.spec b/php-nette-database.spec index 90ef19f..563af15 100644 --- a/php-nette-database.spec +++ b/php-nette-database.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit ed0dc48c58ddf9042f736f3c1ac431dfdd825019 +%global gh_commit debc7db9f4d7ffff71e2c3a81f841fbcbab4610d #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -22,7 +22,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.10 +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 Database Component @@ -38,35 +38,38 @@ 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-pdo BuildRequires: php-composer(%{gh_owner}/caching) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "nette/tester": "^1.3" -# "nette/di": "^2.3", -# "mockery/mockery": "^0.9.1" -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.3 -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 +# "nette/tester": "^2.0", +# "nette/di": "^2.4 || ~3.0.0", +# "mockery/mockery": "^1.0.0", +# "tracy/tracy": "^2.4" +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 +# version 1.0.0 is not released BuildRequires: php-composer(mockery/mockery) >= 0.9.1 +BuildRequires: php-composer(tracy/tracy) >= 2.3 %endif # from composer.json, "require": { -# "php": ">=5.3.1" +# "php": ">=5.6.0" # "ext-pdo": "*", -# "nette/caching": "^2.2", -# "nette/utils": "^2.3.5" -Requires: php(language) >= 5.3.1 +# "nette/caching": "^2.2", +# "nette/utils": "^2.4 || ~3.0.0" +Requires: php(language) >= 5.6 Requires: php-pdo Requires: php-composer(%{gh_owner}/caching) >= 2.2 Requires: php-composer(%{gh_owner}/caching) < 3 -Requires: php-composer(%{gh_owner}/utils) >= 2.3.5 -Requires: php-composer(%{gh_owner}/utils) < 3 -# from phpcompatinfo report for version 2.3.7 +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-json Requires: php-pcre @@ -114,8 +117,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 %if 0%{?rhel} != 5 @@ -137,12 +138,13 @@ 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 -fi +ret=0 +for cmd in php56 php70 php71 php; do + if which $cmd; then + $cmd %{_bindir}/nette-tester --colors 0 -p $cmd -C tests -s || ret=1 + fi +done +exit $ret %else : Test suite disabled %endif @@ -163,8 +165,16 @@ rm -rf %{buildroot} %changelog -* Wed Oct 19 2016 Remi Collet - 2.3.10-1 -- update to 2.3.10 +* Thu Feb 2 2017 Remi Collet - 2.4.2-1 +- update to 2.4.2 + +* Wed Oct 19 2016 Remi Collet - 2.4.1-1 +- update to 2.4.1 + +* Thu Aug 4 2016 Remi Collet - 2.4.0-1 +- update to 2.4.0 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 * Wed Jun 1 2016 Remi Collet - 2.3.9-1 - update to 2.3.9 -- cgit