diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-01-09 18:28:34 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-01-09 18:28:34 +0100 |
| commit | 2eae46d8a60f413c6ccc846bca6c0f79e38460a2 (patch) | |
| tree | b4cf1cb24807ca6e3736d28c6377620e3f1b368a | |
| parent | 74953bcc6760c0e821889b8a1f11818e4cc055b8 (diff) | |
php-horde-Horde-Routes: 2.0.2
| -rw-r--r-- | Horde_Routes-php54.patch | 11 | ||||
| -rw-r--r-- | php-horde-Horde-Routes.spec | 16 |
2 files changed, 7 insertions, 20 deletions
diff --git a/Horde_Routes-php54.patch b/Horde_Routes-php54.patch deleted file mode 100644 index 8b28a1c..0000000 --- a/Horde_Routes-php54.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Horde/Routes/Mapper.php~ 2012-12-15 16:01:14.332176067 +0100 -+++ lib/Horde/Routes/Mapper.php 2012-12-15 16:01:20.330194840 +0100 -@@ -591,7 +591,7 @@ - // If the URL didn't depend on the SCRIPT_NAME, we'll cache it - // keyed by just the $kargs; otherwise we need to cache it with - // both SCRIPT_NAME and $kargs: -- $cacheKey = $kargs; -+ $cacheKey = serialize($kargs); - if (!empty($environ['SCRIPT_NAME'])) { - $cacheKeyScriptName = sprintf('%s:%s', $environ['SCRIPT_NAME'], $cacheKey); - } else { diff --git a/php-horde-Horde-Routes.spec b/php-horde-Horde-Routes.spec index 5c81322..8e347bc 100644 --- a/php-horde-Horde-Routes.spec +++ b/php-horde-Horde-Routes.spec @@ -4,8 +4,8 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Routes -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Horde Routes URL mapping system Group: Development/Libraries @@ -13,10 +13,6 @@ License: BSD URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -# http://bugs.horde.org/ticket/11894 -# Horde_Routes: Array to string conversion -Patch0: %{pear_name}-php54.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -52,9 +48,7 @@ It is a port of a Python library, Routes, by Ben Bangert %setup -q -c cd %{pear_name}-%{version} -%patch0 -p0 -b .php54 -sed -e '/Mapper.php/s/md5sum.*name/name/' \ - ../package.xml >%{name}.xml +mv ../package.xml %{name}.xml %build @@ -102,6 +96,10 @@ fi %changelog +* Wed Jan 9 2013 Remi Collet <remi@fedoraproject.org> - 2.0.2-1 +- Update to 2.0.2 for remi repo +- drop patch merged upstream + * Sat Dec 15 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-2 - add patch for http://bugs.horde.org/ticket/11894 |