From 82defe08a2e88b3b1289471dce78add2979861f0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 10:23:29 +0200 Subject: switch --- .gitignore | 7 ++ composer-dev.json | 42 ----------- composer.json | 18 +++-- php-nette-caching-dev.spec | 171 --------------------------------------------- php-nette-caching.spec | 71 ++++++++++++------- 5 files changed, 62 insertions(+), 247 deletions(-) create mode 100644 .gitignore delete mode 100644 composer-dev.json delete mode 100644 php-nette-caching-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 8f36502..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "nette/caching", - "description": "Nette Caching 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", - "nette/finder": "^2.2 || ~3.0.0", - "nette/utils": "^2.4 || ~3.0.0" - }, - "require-dev": { - "nette/tester": "^2.0", - "nette/di": "^2.4 || ~3.0.0", - "latte/latte": "^2.4", - "tracy/tracy": "^2.4" - }, - "suggest": { - "ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "autoload": { - "classmap": ["src/"] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev" - } - } -} diff --git a/composer.json b/composer.json index a5ccf5a..8f36502 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,18 @@ } ], "require": { - "php": ">=5.3.1", - "nette/finder": "~2.2", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/finder": "^2.2 || ~3.0.0", + "nette/utils": "^2.4 || ~3.0.0" }, "require-dev": { - "nette/tester": "~1.6", - "nette/di": "~2.3", - "latte/latte": "~2.3.0" + "nette/tester": "^2.0", + "nette/di": "^2.4 || ~3.0.0", + "latte/latte": "^2.4", + "tracy/tracy": "^2.4" + }, + "suggest": { + "ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal" }, "conflict": { "nette/nette": "<2.2" @@ -32,7 +36,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.5-dev" } } } diff --git a/php-nette-caching-dev.spec b/php-nette-caching-dev.spec deleted file mode 100644 index 1609cde..0000000 --- a/php-nette-caching-dev.spec +++ /dev/null @@ -1,171 +0,0 @@ -# remirepo/fedora spec file for php-nette-caching -# -# 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 2436e530484a346d0a246733519ceaa40b943bd6 -#global gh_date 20150728 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner nette -%global gh_project caching -%global ns_vendor Nette -%global ns_project Caching -%global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.3 -%global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Nette Caching 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-date -BuildRequires: php-reflection -BuildRequires: php-composer(%{gh_owner}/finder) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 -# From composer.json, "require-dev": { -# "nette/tester": "~2.0", -# "nette/di": "^2.4 || ~3.0.0", -# "latte/latte": "^2.4", -# "tracy/tracy": "^2.4" -BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 -BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 -BuildRequires: php-composer(latte/latte) >= 2.4 -BuildRequires: php-composer(tracy/tracy) >= 2.4 -%endif - -# from composer.json, "require": { -# "php": ">=5.6.0", -# "nette/finder": "^2.2 || ~3.0.0", -# "nette/utils": "^2.4 || ~3.0.0" -Requires: php(language) >= 5.6 -Requires: php-composer(%{gh_owner}/finder) >= 2.2 -Requires: php-composer(%{gh_owner}/finder) < 4 -Requires: php-composer(%{gh_owner}/utils) >= 2.4 -Requires: php-composer(%{gh_owner}/utils) < 4 -# from phpcompatinfo report for version 2.3.3 -Requires: php-pdo -Requires: php-reflection -Requires: php-date -%if 0%{?fedora} > 21 -Suggests: php-pecl(memcache) -Suggests: php-pecl(memcached) -%endif - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Cache accelerates your application by storing data, once hardly retrieved, -for future use. - -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}/Finder/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} -: Ignore tests which require memcache -rm tests/Storages/*Memcache* -# remirepo:3 -%if 0%{?rhel} == 5 -rm tests/Storages/SQLiteStorage.sliding.phpt -%endif - -export LANG=fr_FR.utf8 - -: Generate autoloader -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - - 2.5.3-1 -- update to 2.5.3 - -* Wed Oct 19 2016 Remi Collet - 2.5.2-1 -- update to 2.5.2 - -* Tue Aug 2 2016 Remi Collet - 2.5.1-1 -- update to 2.5.1 -- raise dependency on PHP >= 5.6 -- raise dependency on nette/utils >= 2.4 - -* Mon Feb 22 2016 Remi Collet - 2.3.5-1 -- update to 2.3.5 -- run test suite with both PHP 7 and 7 when available - -* Mon Nov 30 2015 Remi Collet - 2.3.4-1 -- update to 2.3.4 - -* Tue Oct 20 2015 Remi Collet - 2.3.3-1 -- initial package diff --git a/php-nette-caching.spec b/php-nette-caching.spec index 72a9d45..1609cde 100644 --- a/php-nette-caching.spec +++ b/php-nette-caching.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 0cb5c2c91e92a155ca5c1700479476b80c30dece +%global gh_commit 2436e530484a346d0a246733519ceaa40b943bd6 #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.5.3 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Caching Component @@ -33,36 +33,39 @@ 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-date BuildRequires: php-reflection BuildRequires: php-composer(%{gh_owner}/finder) >= 2.2 -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4 # From composer.json, "require-dev": { -# "nette/tester": "~1.6" -# "nette/di": "~2.3", -# "latte/latte": "~2.3.0" -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.6 -BuildRequires: php-composer(%{gh_owner}/di) >= 2.3 -BuildRequires: php-composer(latte/latte) >= 2.3 +# "nette/tester": "~2.0", +# "nette/di": "^2.4 || ~3.0.0", +# "latte/latte": "^2.4", +# "tracy/tracy": "^2.4" +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 +BuildRequires: php-composer(%{gh_owner}/di) >= 2.4 +BuildRequires: php-composer(latte/latte) >= 2.4 +BuildRequires: php-composer(tracy/tracy) >= 2.4 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -# "nette/finder": "~2.2", -# "nette/utils": "~2.2" -Requires: php(language) >= 5.3.1 +# "php": ">=5.6.0", +# "nette/finder": "^2.2 || ~3.0.0", +# "nette/utils": "^2.4 || ~3.0.0" +Requires: php(language) >= 5.6 Requires: php-composer(%{gh_owner}/finder) >= 2.2 -Requires: php-composer(%{gh_owner}/finder) < 3 -Requires: php-composer(%{gh_owner}/utils) >= 2.2 -Requires: php-composer(%{gh_owner}/utils) < 3 +Requires: php-composer(%{gh_owner}/finder) < 4 +Requires: php-composer(%{gh_owner}/utils) >= 2.4 +Requires: php-composer(%{gh_owner}/utils) < 4 # from phpcompatinfo report for version 2.3.3 Requires: php-pdo +Requires: php-reflection Requires: php-date -Requires: php-spl %if 0%{?fedora} > 21 Suggests: php-pecl(memcache) +Suggests: php-pecl(memcached) %endif Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -101,9 +104,11 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ %if %{with_tests} : Ignore tests which require memcache rm tests/Storages/*Memcache* +# remirepo:3 +%if 0%{?rhel} == 5 +rm tests/Storages/SQLiteStorage.sliding.phpt +%endif -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -117,12 +122,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 php71 php70 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 @@ -143,6 +149,17 @@ rm -rf %{buildroot} %changelog +* Thu Feb 2 2017 Remi Collet - 2.5.3-1 +- update to 2.5.3 + +* Wed Oct 19 2016 Remi Collet - 2.5.2-1 +- update to 2.5.2 + +* Tue Aug 2 2016 Remi Collet - 2.5.1-1 +- update to 2.5.1 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 + * Mon Feb 22 2016 Remi Collet - 2.3.5-1 - update to 2.3.5 - run test suite with both PHP 7 and 7 when available @@ -151,4 +168,4 @@ rm -rf %{buildroot} - update to 2.3.4 * Tue Oct 20 2015 Remi Collet - 2.3.3-1 -- initial package \ No newline at end of file +- initial package -- cgit