summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json11
-rw-r--r--php-solarium4.spec16
2 files changed, 20 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 518fa0a..3b61a99 100644
--- a/composer.json
+++ b/composer.json
@@ -18,9 +18,9 @@
"require-dev": {
"guzzlehttp/guzzle": "^3.8 || ^6.2",
"phpunit/phpunit": "^6.5",
- "satooshi/php-coveralls": "^1.0",
+ "php-coveralls/php-coveralls": "^1.0",
"squizlabs/php_codesniffer": "^1.4",
- "zendframework/zendframework1": "^1.12"
+ "zendframework/zendframework": "^3.0"
},
"suggest": {
"minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling"
@@ -37,5 +37,12 @@
"psr-4": {
"Solarium\\Tests\\": "tests/"
}
+ },
+ "extra": {
+ "branch-alias": {
+ "4.1.x-dev": "dev-master",
+ "dev-4.1.x": "dev-master",
+ "dev-4.0.x": "4.0.x-dev"
+ }
}
}
diff --git a/php-solarium4.spec b/php-solarium4.spec
index 3e526b7..c02f24b 100644
--- a/php-solarium4.spec
+++ b/php-solarium4.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 9af3e40e72b60ce372726160ceba2d46b04fd0b9
+%global gh_commit 4dfd71fefb307cac1ec394b672f2f57256752e4b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner solariumphp
%global gh_project solarium
@@ -15,7 +15,7 @@
Name: php-%{gh_project}%{major}
Summary: Solarium PHP Solr client library
-Version: 4.0.0
+Version: 4.1.0
Release: 1%{?dist}
URL: http://www.solarium-project.org/
@@ -36,9 +36,9 @@ BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require-dev": {
# "guzzlehttp/guzzle": "^3.8 || ^6.2",
# "phpunit/phpunit": "^6.5",
-# "satooshi/php-coveralls": "^1.0",
+# "php-coveralls/php-coveralls": "^1.0",
# "squizlabs/php_codesniffer": "^1.4",
-# "zendframework/zendframework1": "^1.12"
+# "zendframework/zendframework": "^3.0"
BuildRequires: phpunit6 >= 6.5
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(guzzlehttp/guzzle) >= 6.2 with php-composer(guzzlehttp/guzzle) < 7)
@@ -61,7 +61,8 @@ Requires: php-symfony3-event-dispatcher
%if 0%{?fedora}> 21 || 0%{?rhel} >= 8
Suggests: php-composer(minimalcode/search)
%endif
-# From phpcompatinfo report for version 3.7.0
+# From phpcompatinfo report for version 4.1.0
+Requires: php-reflection
Requires: php-curl
Requires: php-date
Requires: php-json
@@ -119,6 +120,8 @@ cp -pr src %{buildroot}%{_datadir}/php/Solarium%{major}
%check
%if %{with_tests}
+rm tests/Core/Client/Adapter/Zend*
+
: Autoloader
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
@@ -152,6 +155,9 @@ exit $ret
%changelog
+* Mon Aug 20 2018 Remi Collet <remi@remirepo.net> - 4.1.0-1
+- update to 4.1.0
+
* Tue Jun 12 2018 Remi Collet <remi@remirepo.net> - 4.0.0-1
- update to 4.0.0
- rename to php-solarium4