[php-horde-Horde-Routes] update to 2.0.2

Remi Collet remi at fedoraproject.org
Wed Jan 9 18:13:44 UTC 2013


commit 09dea9f457be781683d36d92e1c164b2aef0d80d
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 9 19:13:37 2013 +0100

    update to 2.0.2

 .gitignore                  |    2 ++
 Horde_Routes-php54.patch    |   11 -----------
 php-horde-Horde-Routes.spec |   16 +++++++---------
 sources                     |    2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea47327..c9641ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*spec~
 /Horde_Routes-2.0.1.tgz
+/Horde_Routes-2.0.2.tgz
diff --git a/php-horde-Horde-Routes.spec b/php-horde-Horde-Routes.spec
index fcc3595..81c1c9d 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-common >= 5.3.0
@@ -53,9 +49,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
@@ -103,6 +97,10 @@ fi
 
 
 %changelog
+* Wed Jan  9 2013 Remi Collet <remi at 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 at fedoraproject.org> - 2.0.1-2
 - add patch for http://bugs.horde.org/ticket/11894
 
diff --git a/sources b/sources
index 59ab6e6..82c806a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-903fe18a3fe73afc025a5ae83d858fdc  Horde_Routes-2.0.1.tgz
+e5dee754c112aef9dfd8ae0cef1b9d63  Horde_Routes-2.0.2.tgz


More information about the scm-commits mailing list