summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-02-13 07:19:33 +0100
committerRemi Collet <remi@remirepo.net>2020-02-13 07:19:33 +0100
commit727af33955351183492388f80d281eb21fb4059e (patch)
treef19d796b3c3a1c655ae347d024cd66d471564b0c
parentdd93137661ea20fd508f04eeaff12f5edbc958be (diff)
v2.5.0 from FedoraHEADmaster
-rw-r--r--composer.json8
-rw-r--r--php-mtdowling-jmespath-php.spec40
2 files changed, 16 insertions, 32 deletions
diff --git a/composer.json b/composer.json
index 79a2c5e..8ae5bb0 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,13 @@
],
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.4.0",
+ "symfony/polyfill-mbstring": "^1.4"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "composer/xdebug-handler": "^1.2",
+ "phpunit/phpunit": "^4.8.36|^7.5.15"
},
"autoload": {
@@ -31,7 +33,7 @@
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.5-dev"
}
}
}
diff --git a/php-mtdowling-jmespath-php.spec b/php-mtdowling-jmespath-php.spec
index 6404fe1..789671a 100644
--- a/php-mtdowling-jmespath-php.spec
+++ b/php-mtdowling-jmespath-php.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-mtdowling-jmespath-php
#
-# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
%global github_owner jmespath
%global github_name jmespath.php
-%global github_version 2.4.0
-%global github_commit adcc9531682cf87dfda21e1fd5d0e7a41d292fac
+%global github_version 2.5.0
+%global github_commit 52168cb9472de06979613d365c7f1ab8798be895
%global composer_vendor mtdowling
%global composer_project jmespath.php
@@ -31,20 +31,19 @@ Version: %{github_version}
Release: 1%{?github_release}%{?dist}
Summary: Declaratively specify how to extract elements from a JSON document
-Group: Development/Libraries
License: MIT
URL: https://github.com/%{github_owner}/%{github_name}
Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
# Tests
%if %{with_tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 2.4.0)
+## phpcompatinfo (computed from version 2.5.0)
BuildRequires: php-json
+BuildRequires: php-mbstring
BuildRequires: php-spl
## Autoloader
BuildRequires: php-composer(fedora/autoloader)
@@ -53,14 +52,15 @@ BuildRequires: php-composer(fedora/autoloader)
Requires: php-cli
# composer.json
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 2.4.0)
+# phpcompatinfo (computed from version 2.5.0)
Requires: php-json
+Requires: php-mbstring
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
# php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}
-Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release}
+Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release}
# Composer
Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
@@ -97,7 +97,6 @@ sed "s#.*require.*autoload.*#require_once '%{phpdir}/JmesPath/autoload.php';#" \
%install
-rm -rf %{buildroot}
: Lib
mkdir -p %{buildroot}%{phpdir}/JmesPath
cp -rp src/* %{buildroot}%{phpdir}/JmesPath/
@@ -114,34 +113,14 @@ sed 's/function testTokenizesJsonNumbers/function SKIP_testTokenizesJsonNumbers/
-i tests/LexerTest.php
: Run tests
-# remirepo:11
-run=0
-ret=0
-if which php56; then
- php56 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/JmesPath/autoload.php || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/JmesPath/autoload.php || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
%{_bindir}/phpunit --verbose \
--bootstrap %{buildroot}%{phpdir}/JmesPath/autoload.php
-# remirepo:2
-fi
-exit $ret
%else
: Tests skipped
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc CHANGELOG.md
@@ -152,6 +131,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Feb 12 2020 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.5.0-1
+- Update to 2.5.0 (RHBZ #1787856)
+
* Wed Dec 07 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.4.0-1
- Update to 2.4.0 (RHBZ #1401271)
- Change autoloader from php-composer(symfony/class-loader) to