[php-solarium] update to 3.3.0

Remi Collet remi at fedoraproject.org
Wed Nov 19 06:43:29 UTC 2014


commit 05cc033308194a1a6523a663c74b88c7a1c27173
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Nov 19 07:43:26 2014 +0100

    update to 3.3.0

 .gitignore        |    1 +
 php-solarium.spec |   26 ++++++++++++++++++++------
 sources           |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d837f0..5401b35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /solarium-3.1.2.tar.gz
 /solarium-3.2.0.tar.gz
+/solarium-3.3.0.tar.gz
diff --git a/php-solarium.spec b/php-solarium.spec
index 5125b51..8639bf9 100644
--- a/php-solarium.spec
+++ b/php-solarium.spec
@@ -6,16 +6,21 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    f602c2020d1b57e7a3aa0c75088222ce31438aba
+%global gh_commit    a9d8a52ba9fd8add04b2294fad997a004c1f2fab
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     basdenooijer
 %global gh_project   solarium
+%if 0%{?rhel} == 6
+# upstream ignore test results for PHP 5.3 (see .travis.yml)
+%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%else
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%endif
 
 Name:           php-%{gh_project}
 Summary:        Solarium PHP Solr client library
-Version:        3.2.0
-Release:        2%{?dist}
+Version:        3.3.0
+Release:        1%{?dist}
 
 URL:            http://www.solarium-project.org/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
@@ -42,6 +47,8 @@ Requires:       php-json
 Requires:       php-pcre
 Requires:       php-spl
 
+Provides:       php-composer(solarium/solarium) = %{version}
+
 
 %description
 Solarium is a PHP Solr client library that accurately model Solr concepts.
@@ -93,19 +100,26 @@ cp -pr library/Solarium %{buildroot}%{_datadir}/php/Solarium
 %if %{with_tests}
 : Run upstream test suite against installed library
 phpunit \
-  --include-path=%{buildroot}%{_datadir}/php:./tests \
-  -d date.timezone=UTC
+  --include-path=%{buildroot}%{_datadir}/php:./tests
 %else
 : Skip upstream test suite
 %endif
 
 
 %files
-%doc composer.json COPYING README.md examples
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc composer.json README.md examples
 %{_datadir}/php/Solarium
 
 
 %changelog
+* Mon Nov 17 2014 Remi Collet <remi at fedoraproject.org> - 3.3.0-1
+- update to 3.3.0
+- provide php-composer(solarium/solarium)
+- fix license handling
+- don't run test suite with php 5.3 (EL-6)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 8204093..93ee9fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cedeab8f2cfe4280a8a0fda9a45827c8  solarium-3.2.0.tar.gz
+8741fed70ecc9771c04d047e1d2d4548  solarium-3.3.0.tar.gz


More information about the scm-commits mailing list