From e62d5780fc5e0311a2ce0ed94d5a33aec1cde68f Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 7 May 2013 09:07:13 +0200
Subject: php-horde-Horde-Vfs: 2.1.0

---
 php-horde-Horde-Vfs-shebang.patch | 13 -------------
 php-horde-Horde-Vfs.spec          | 19 +++++++------------
 2 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 php-horde-Horde-Vfs-shebang.patch

diff --git a/php-horde-Horde-Vfs-shebang.patch b/php-horde-Horde-Vfs-shebang.patch
deleted file mode 100644
index 68ebfc6..0000000
--- a/php-horde-Horde-Vfs-shebang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- package-2.0.4.xml	2013-02-10 18:13:15.000000000 +0100
-+++ package.xml	2013-02-10 18:13:28.000000000 +0100
-@@ -45,7 +45,9 @@
-  </notes>
-  <contents>
-   <dir baseinstalldir="/" name="/">
--   <file baseinstalldir="/" md5sum="e2c4a7340ace57795253ca0812e4f1d0" name="bin/horde-vfs" role="script" />
-+   <file baseinstalldir="/" md5sum="e2c4a7340ace57795253ca0812e4f1d0" name="bin/horde-vfs" role="script">
-+      <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-+   </file>
-    <file baseinstalldir="/" md5sum="321bf41f280cf805086dd5a720b37785" name="doc/Horde/Vfs/COPYING" role="doc" />
-    <file baseinstalldir="/" md5sum="a9adb5355e45ea8b0f748b3e5a83e94d" name="doc/Horde/Vfs/UPGRADING" role="doc" />
-    <file baseinstalldir="/" md5sum="95dc980e85c096d5a3d5cbed6a89c606" name="lib/Horde/Vfs/Base.php" role="php" />
diff --git a/php-horde-Horde-Vfs.spec b/php-horde-Horde-Vfs.spec
index cf83f73..270440f 100644
--- a/php-horde-Horde-Vfs.spec
+++ b/php-horde-Horde-Vfs.spec
@@ -8,8 +8,8 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Vfs
-Version:        2.0.4
-Release:        3%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Virtual File System API
 
 Group:          Development/Libraries
@@ -17,9 +17,6 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# https://github.com/horde/horde/pull/29
-Patch0:         %{name}-shebang.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  php-common >= 5.3.0
@@ -51,15 +48,12 @@ Requires:       php-ftp
 Requires:       php-pecl(ssh2)
 Requires:       php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Auth) >= 3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Db) >= 3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Kolab_Session) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Kolab_Session) >= 3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Mime) >= 3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Perms) >= 3.0.0
-# skip Horde_Core (avoid circular dependency)
+# Optional and skiped to avoid circular dependency: Horde_Core
+# Optional and implicitly required: Horde_Db, Horde_Mime
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -82,8 +76,6 @@ object-based and array-based interfaces to directory listings.
 %prep
 %setup -q -c
 
-%patch0 -p0 -b .shebang
-
 cd %{pear_name}-%{version}
 
 # Don't install .po and .pot files
@@ -161,6 +153,9 @@ fi
 
 
 %changelog
+* Tue May 07 2013 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+
 * Sun Feb 10 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-3
 - fix shebang, https://github.com/horde/horde/pull/29
 
-- 
cgit