summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore8
-rw-r--r--php-solarium-autoload.php4
-rw-r--r--php-solarium.spec10
3 files changed, 17 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-solarium-autoload.php b/php-solarium-autoload.php
index f3c802d..5308326 100644
--- a/php-solarium-autoload.php
+++ b/php-solarium-autoload.php
@@ -6,8 +6,8 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Solarium\\', __DIR__);
\Fedora\Autoloader\Dependencies::required(array(
array(
- '/usr/share/php/Symfony/Component/autoload.php',
- '/usr/share/php/Symfony/autoload.php',
+ '/usr/share/php/Symfony3/Component/EventDispatcher/autoload.php',
+ '/usr/share/php/Symfony/Component/EventDispatcher/autoload.php',
),
));
diff --git a/php-solarium.spec b/php-solarium.spec
index 92b94eb..0a65b0b 100644
--- a/php-solarium.spec
+++ b/php-solarium.spec
@@ -15,7 +15,7 @@
Name: php-%{gh_project}
Summary: Solarium PHP Solr client library
Version: 3.8.1
-Release: 1%{?dist}
+Release: 4%{?dist}
URL: http://www.solarium-project.org/
License: BSD
@@ -28,6 +28,7 @@ BuildArch: noarch
%if %{with_tests}
# For tests
BuildRequires: php(language) >= 5.3.2
+BuildRequires: php-composer(symfony/event-dispatcher) < 4
BuildRequires: php-composer(symfony/event-dispatcher) > 2.3
BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require-dev": {
@@ -48,8 +49,8 @@ BuildRequires: php-guzzle-Guzzle >= 3.8
# "php": ">=5.3.2",
# "symfony/event-dispatcher": "~2.3|~3.0"
Requires: php(language) >= 5.3.2
-Requires: php-composer(symfony/event-dispatcher) > 2.3
Requires: php-composer(symfony/event-dispatcher) < 4
+Requires: php-composer(symfony/event-dispatcher) > 2.3
# From composer.json, "suggest": {
# "minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling"
%if 0%{?fedora}> 21
@@ -114,7 +115,7 @@ EOF
: Run upstream test suite against installed library
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}/phpunit || ret=1
fi
@@ -134,6 +135,9 @@ exit $ret
%changelog
+* Thu Oct 5 2017 Remi Collet <remi@remirepo.net> - 3.8.1-4
+- fix autoloader for Symfony 3, FTBFS from Koschei
+
* Thu Feb 2 2017 Remi Collet <remi@fedoraproject.org> - 3.8.1-1
- update to 3.8.1