diff options
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-nette-database.spec | 29 |
2 files changed, 17 insertions, 17 deletions
diff --git a/composer.json b/composer.json index f7b1268..c6d8832 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name": "nette/database", - "description": "Nette Database Component", + "description": "💾 Nette Database: layer with a familiar PDO-like API but much more powerful. Building queries, advanced joins, drivers for MySQL, PostgreSQL, SQLite, MS SQL Server and Oracle.", + "keywords": ["nette", "database", "notorm", "queries", "pdo", "mysql", "postgresql", "sqlite", "mssql", "oracle"], "homepage": "https://nette.org", "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"], "authors": [ @@ -17,7 +18,7 @@ "php": ">=5.6.0", "ext-pdo": "*", "nette/caching": "^2.2", - "nette/utils": "^2.4 || ~3.0.0" + "nette/utils": "^2.4" }, "require-dev": { "nette/tester": "^2.0", diff --git a/php-nette-database.spec b/php-nette-database.spec index 563af15..93e4f5e 100644 --- a/php-nette-database.spec +++ b/php-nette-database.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit debc7db9f4d7ffff71e2c3a81f841fbcbab4610d +%global gh_commit 9b16e3ea2d9c21579962a17d81e17e4f71f59d6b #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -22,9 +22,9 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.4.2 +Version: 2.4.4 %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 Database Component Group: Development/Libraries @@ -34,7 +34,6 @@ 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} @@ -62,13 +61,13 @@ BuildRequires: php-composer(tracy/tracy) >= 2.3 # "php": ">=5.6.0" # "ext-pdo": "*", # "nette/caching": "^2.2", -# "nette/utils": "^2.4 || ~3.0.0" +# "nette/utils": "^2.4" 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 +Requires: php-composer(%{gh_owner}/utils) < 3 # from phpcompatinfo report for version 2.4.0 Requires: php-date Requires: php-json @@ -110,7 +109,6 @@ EOF %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{php_home}/%{ns_vendor} cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ @@ -119,13 +117,16 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ %if %{with_tests} export LANG=fr_FR.utf8 -%if 0%{?rhel} != 5 +%if 0%{?rhel} == 7 +# https://github.com/nette/database/issues/178 +rm tests/Database/ResultSet.exceptions.sqlite.phpt +%endif + : Generate minimal Sqlite condiguration cat << 'EOF' | tee tests/Database/databases.ini [sqlite] dsn = "sqlite::memory:" EOF -%endif : Generate autoloader mkdir vendor @@ -139,7 +140,7 @@ EOF : Run test suite in sources tree ret=0 -for cmd in php56 php70 php71 php; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/nette-tester --colors 0 -p $cmd -C tests -s || ret=1 fi @@ -150,12 +151,7 @@ exit $ret %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license license.md %doc readme.md contributing.md @@ -165,6 +161,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 6 2017 Remi Collet <remi@remirepo.net> - 2.4.4-1 +- Update to 2.4.4 + * Thu Feb 2 2017 Remi Collet <remi@fedoraproject.org> - 2.4.2-1 - update to 2.4.2 |