[php-horde-Horde-Stream/el6] update to 1.6.1

Remi Collet remi at fedoraproject.org
Wed Feb 12 08:50:30 UTC 2014


commit 0adda552eed39c8e625b96387d86a464b7b8c23d
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Feb 12 09:49:04 2014 +0100

    update to 1.6.1
    
    (cherry picked from commit 693e7b24dfe5c452f81e5e45e901bd15cc59542a)

 .gitignore                  |    1 +
 php-horde-Horde-Stream.spec |   20 +++++++++++++++-----
 sources                     |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a7ffe7..be04316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /Horde_Stream-1.3.0.tgz
 /Horde_Stream-1.4.0.tgz
 /Horde_Stream-1.5.0.tgz
+/Horde_Stream-1.6.1.tgz
diff --git a/php-horde-Horde-Stream.spec b/php-horde-Horde-Stream.spec
index 4617579..49da484 100644
--- a/php-horde-Horde-Stream.spec
+++ b/php-horde-Horde-Stream.spec
@@ -1,18 +1,18 @@
 # spec file for php-horde-Horde-Stream
 #
-# Copyright (c) 2012-2013 Remi Collet
+# Copyright (c) 2012-2014 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/3.0/
 #
 # Please, preserve the changelog entries
 #
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name    Horde_Stream
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Stream
-Version:        1.5.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Horde stream handler
 
@@ -30,13 +30,19 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+# From package.xml, required
 Requires:       php(language) >= 5.3.0
-Requires:       php-json
-Requires:       php-spl
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
+# From package.xml, optional
+Requires:       php-pear(%{pear_channel}/Horde_Stream_Wrapper) >= 2.1.0
+Requires:       php-pear(%{pear_channel}/Horde_Stream_Wrapper) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
+# From phpcompatinfo report for version 1.6.0
+Requires:       php-json
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -98,6 +104,10 @@ fi
 
 
 %changelog
+* Wed Feb 12 2014 Remi Collet <remi at fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1
+- add optional dependencies, Horde_Stream_Wrapper, Horde_Util
+
 * Tue Nov 12 2013 Remi Collet <remi at fedoraproject.org> - 1.5.0-1
 - Update to 1.5.0
 
diff --git a/sources b/sources
index 784c748..f612a43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb4084414d36a2488632e16e40bd0512  Horde_Stream-1.5.0.tgz
+b7fe7a87e8234c749fe03bf420aa3992  Horde_Stream-1.6.1.tgz


More information about the scm-commits mailing list