summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer-dev.json43
-rw-r--r--composer.json12
-rw-r--r--php-nette-utils-dev.spec202
-rw-r--r--php-nette-utils.spec66
4 files changed, 60 insertions, 263 deletions
diff --git a/composer-dev.json b/composer-dev.json
deleted file mode 100644
index b33767a..0000000
--- a/composer-dev.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "name": "nette/utils",
- "description": "Nette Utility Classes",
- "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"
- },
- "require-dev": {
- "nette/tester": "~2.0",
- "tracy/tracy": "^2.3"
- },
- "suggest": {
- "ext-iconv": "to use Strings::webalize() and toAscii()",
- "ext-json": "to use Nette\\Utils\\Json",
- "ext-intl": "for script transliteration in Strings::webalize() and toAscii()",
- "ext-mbstring": "to use Strings::lower() etc...",
- "ext-xml": "to use Strings::length() etc. when mbstring is not available",
- "ext-gd": "to use Image"
- },
- "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 7c1287f..b33767a 100644
--- a/composer.json
+++ b/composer.json
@@ -14,10 +14,11 @@
}
],
"require": {
- "php": ">=5.3.1"
+ "php": ">=5.6.0"
},
"require-dev": {
- "nette/tester": "~1.0"
+ "nette/tester": "~2.0",
+ "tracy/tracy": "^2.3"
},
"suggest": {
"ext-iconv": "to use Strings::webalize() and toAscii()",
@@ -33,5 +34,10 @@
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}
diff --git a/php-nette-utils-dev.spec b/php-nette-utils-dev.spec
deleted file mode 100644
index b49e154..0000000
--- a/php-nette-utils-dev.spec
+++ /dev/null
@@ -1,202 +0,0 @@
-# remirepo/fedora spec file for php-nette-utils
-#
-# 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 714afb64d0da07d0da7178cbf5680008e4b0180b
-#global gh_date 20150728
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner nette
-%global gh_project utils
-%global ns_vendor Nette
-%global php_home %{_datadir}/php
-%global with_tests 0%{!?_without_tests:1}
-
-Name: php-nette-utils
-Version: 2.4.4
-%global specrel 1
-Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
-Summary: Nette Utility Classes
-
-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-intl
-BuildRequires: php-mbstring
-BuildRequires: php-gd
-BuildRequires: php-date
-BuildRequires: php-fileinfo
-BuildRequires: php-json
-BuildRequires: php-mcrypt
-BuildRequires: php-openssl
-BuildRequires: php-pcre
-BuildRequires: php-reflection
-BuildRequires: php-spl
-BuildRequires: php-xml
-# From composer.json, "require-dev": {
-# "nette/tester": "~2.0",
-# "tracy/tracy": "^2.3"
-# ignore tester min version (pass with 1.7), ignore tracy (pass without)
-BuildRequires: php-composer(%{gh_owner}/tester)
-%endif
-
-# from composer.json, "require": {
-# "php": ">=5.6.0"
-Requires: php(language) >= 5.6
-# from composer.json, "suggest": {
-# "ext-iconv": "to use Strings::webalize() and toAscii()",
-# "ext-json": "to use Nette\\Utils\\Json",
-# "ext-intl": "for script transliteration in Strings::webalize() and toAscii()",
-# "ext-mbstring": "to use Strings::lower() etc...",
-# "ext-xml": "to use Strings::length() etc. when mbstring is not available",
-# "ext-gd": "to use Image"
-%if 0%{?fedora} > 21
-Recommends: php-iconv
-Recommends: php-json
-Recommends: php-intl
-Recommends: php-mbstring
-Recommends: php-xml
-Recommends: php-gd
-%else
-Requires: php-iconv
-Requires: php-json
-Requires: php-intl
-Requires: php-mbstring
-Requires: php-xml
-Requires: php-gd
-%endif
-# from phpcompatinfo report for version 2.4.0 (mcrypt is optional, openssl prefered)
-Requires: php-date
-Requires: php-fileinfo
-Requires: php-openssl
-Requires: php-pcre
-Requires: php-reflection
-Requires: php-spl
-
-Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
-
-
-%description
-Nette Utility Classes.
-
-To use this library, you just have to add, in your project:
- require_once '%{php_home}/%{ns_vendor}/Utils/autoload.php';';
-
-
-%prep
-%setup -q -n %{gh_project}-%{gh_commit}
-
-
-%build
-: Generate a classmap autoloader
-phpab --output src/Utils/autoload.php src
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{php_home}/%{ns_vendor}
-cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
-
-
-%check
-%if %{with_tests}
-: Ignore failed tests under investigation
-rm tests/Utils/Image.alpha1.phpt
-rm tests/Utils/Image.alpha2.phpt
-rm tests/Utils/Image.resize.phpt
-rm tests/Utils/Json.decode\(\).phpt
-rm tests/Utils/Image.drawing.phpt
-rm tests/Utils/Image.place.phpt
-
-export LANG=fr_FR.utf8
-
-: Generate autoloader
-mkdir vendor
-cat << 'EOF' | tee vendor/autoload.php
-<?php
-require_once '%{php_home}/Tester/autoload.php';
-require_once '%{buildroot}%{php_home}/%{ns_vendor}/Utils/autoload.php';
-EOF
-
-: Run test suite in sources tree
-# remirepo:11
-ret=0
-run=0
-if which php56; then
- php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -s || ret=1
- 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
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
-%license license.md
-%doc readme.md contributing.md
-%doc composer.json
-%dir %{php_home}/%{ns_vendor}
- %{php_home}/%{ns_vendor}/Utils
- %{php_home}/%{ns_vendor}/Iterators
-
-
-%changelog
-* Mon Jan 16 2017 Remi Collet <remi@fedoraproject.org> - 2.4.4-1
-- update to 2.4.4
-
-* Wed Jan 11 2017 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
-- update to 2.4.3
-
-* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
-- update to 2.4.2
-
-* Fri Sep 30 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
-- update to 2.4.1
-
-* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
-- update to 2.4.0
-- raise dependency on PHP >= 5.6
-
-* Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1
-- update to 2.3.10
-
-* Thu Jun 2 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1
-- update to 2.3.9
-
-* Sat Apr 2 2016 Remi Collet <remi@fedoraproject.org> - 2.3.8-1
-- update to 2.3.8
-- run test suite with both php 5 and 7 when available
-
-* Mon Nov 30 2015 Remi Collet <remi@fedoraproject.org> - 2.3.7-1
-- update to 2.3.7
-
-* Tue Oct 20 2015 Remi Collet <remi@fedoraproject.org> - 2.3.6-1
-- initial package
diff --git a/php-nette-utils.spec b/php-nette-utils.spec
index 68f3ab1..b49e154 100644
--- a/php-nette-utils.spec
+++ b/php-nette-utils.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit f213ad4d9dfb7221322bd2808e2004b61c8ece8e
+%global gh_commit 714afb64d0da07d0da7178cbf5680008e4b0180b
#global gh_date 20150728
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner nette
@@ -16,7 +16,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-nette-utils
-Version: 2.3.11
+Version: 2.4.4
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette Utility Classes
@@ -32,7 +32,7 @@ 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-intl
BuildRequires: php-mbstring
@@ -47,13 +47,15 @@ BuildRequires: php-reflection
BuildRequires: php-spl
BuildRequires: php-xml
# From composer.json, "require-dev": {
-# "nette/tester": "~1.0"
+# "nette/tester": "~2.0",
+# "tracy/tracy": "^2.3"
+# ignore tester min version (pass with 1.7), ignore tracy (pass without)
BuildRequires: php-composer(%{gh_owner}/tester)
%endif
# from composer.json, "require": {
-# "php": ">=5.3.1"
-Requires: php(language) >= 5.3.1
+# "php": ">=5.6.0"
+Requires: php(language) >= 5.6
# from composer.json, "suggest": {
# "ext-iconv": "to use Strings::webalize() and toAscii()",
# "ext-json": "to use Nette\\Utils\\Json",
@@ -61,13 +63,22 @@ Requires: php(language) >= 5.3.1
# "ext-mbstring": "to use Strings::lower() etc...",
# "ext-xml": "to use Strings::length() etc. when mbstring is not available",
# "ext-gd": "to use Image"
+%if 0%{?fedora} > 21
+Recommends: php-iconv
+Recommends: php-json
+Recommends: php-intl
+Recommends: php-mbstring
+Recommends: php-xml
+Recommends: php-gd
+%else
Requires: php-iconv
Requires: php-json
Requires: php-intl
Requires: php-mbstring
Requires: php-xml
Requires: php-gd
-# from phpcompatinfo report for version 2.3.6 (mcrypt is optional, openssl prefered)
+%endif
+# from phpcompatinfo report for version 2.4.0 (mcrypt is optional, openssl prefered)
Requires: php-date
Requires: php-fileinfo
Requires: php-openssl
@@ -104,17 +115,14 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/
%if %{with_tests}
: Ignore failed tests under investigation
rm tests/Utils/Image.alpha1.phpt
+rm tests/Utils/Image.alpha2.phpt
+rm tests/Utils/Image.resize.phpt
rm tests/Utils/Json.decode\(\).phpt
rm tests/Utils/Image.drawing.phpt
rm tests/Utils/Image.place.phpt
-: Generate configuration
-cat /etc/php.ini /etc/php.d/*ini >php.ini
export LANG=fr_FR.utf8
-: For PHP 5.3.3 on RHEL-6
-sed -e 's/50303/99999/' -i tests/Utils/Object.magicMethod.errors.phpt
-
: Generate autoloader
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
@@ -124,7 +132,22 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/Utils/autoload.php';
EOF
: Run test suite in sources tree
-nette-tester --colors 0 -p php -c ./php.ini tests -s
+# remirepo:11
+ret=0
+run=0
+if which php56; then
+ php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1
+ run=1
+fi
+if which php71; then
+ php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -s || ret=1
+ 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
@@ -146,8 +169,21 @@ rm -rf %{buildroot}
%changelog
-* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.3.11-1
-- update to 2.3.11
+* Mon Jan 16 2017 Remi Collet <remi@fedoraproject.org> - 2.4.4-1
+- update to 2.4.4
+
+* Wed Jan 11 2017 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
+- update to 2.4.3
+
+* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+
+* Fri Sep 30 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- update to 2.4.1
+
+* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- update to 2.4.0
+- raise dependency on PHP >= 5.6
* Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1
- update to 2.3.10
generated by cgit (git 2.34.1) at 2024-11-22 06:29:37 +0000