From 07f6ed7bfb0906e8c4a4d2774b488df3da1a12bc Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 13 Jul 2016 07:23:56 +0200
Subject: php-horde-Horde-Mongo: 1.1.0

---
 php-horde-Horde-Mongo.spec | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'php-horde-Horde-Mongo.spec')

diff --git a/php-horde-Horde-Mongo.spec b/php-horde-Horde-Mongo.spec
index 196d60a..cfdb103 100644
--- a/php-horde-Horde-Mongo.spec
+++ b/php-horde-Horde-Mongo.spec
@@ -11,8 +11,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Mongo
-Version:        1.0.3
-Release:        4%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Horde Mongo Configuration
 
 Group:          Development/Libraries
@@ -20,8 +20,8 @@ License:        LGPLv2
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# https://github.com/horde/horde/pull/194
-Patch0:         %{name}-pr194.patch
+# Fix autoloader path
+Patch0:         %{name}-rpm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -33,13 +33,12 @@ Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php(language) >= 5.3.0
 Requires:       php-spl
-%if 0%{?rhel} >= 5
-Requires:       php-pecl(mongo) >= 1.3.0
-%else
-Requires:       php-composer(alcaeus/mongo-php-adapter)
-%endif
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
+%if 0%{?fedora} >= 21
+Suggests:       php-pecl(mongo) >= 1.3.0
+Suggests:       php-composer(alcaeus/mongo-php-adapter)
+%endif
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 Provides:       php-composer(horde/horde-mongo) = %{version}
@@ -49,13 +48,21 @@ Provides:       php-composer(horde/horde-mongo) = %{version}
 Provides an API to ensure that the PECL Mongo extension can be used
 consistently across various Horde packages.
 
+Tu use this module, you also need to install
+  - php-pecl-mongo (PHP 5 only)
+or
+  - php-pecl-mongodb (PHP 5 or 7)
+  - php-alcaeus-mongo-php-adapter
+
+
 %prep
 %setup -q -c
 
 cd %{pear_name}-%{version}
 mv ../package.xml %{name}.xml
-%patch0 -p3 -b .pr194
+%patch0 -p1 -b .rpm
 sed -e '/Client.php/s/md5sum="[^"]*"//' \
+    -e '/name="bundle/d' \
     -i %{name}.xml
 
 
@@ -101,6 +108,10 @@ fi
 
 
 %changelog
+* Wed Jul 13 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0
+- php-pecl-mongo and alcaeus/mongo-php-adapter are optional
+
 * Sat Jul  2 2016 Remi Collet <remi@fedoraproject.org> - 1.0.3-4
 - on switch to alcaeus/mongo-php-adapter with PHP >= 5.5
 
-- 
cgit