From 53710990ea9c9e5a1bbc5148cd89adec0b3bc11e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 20 Jul 2012 08:01:51 +0200
Subject: php-symfony2-Routing-2.0.16-1, backport

---
 php-symfony2-Routing.spec | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'php-symfony2-Routing.spec')

diff --git a/php-symfony2-Routing.spec b/php-symfony2-Routing.spec
index 5dc56c9..cdb0192 100644
--- a/php-symfony2-Routing.spec
+++ b/php-symfony2-Routing.spec
@@ -1,10 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+
 %global pear_channel pear.symfony.com
-%global pear_name %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g')
+%global pear_name    %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g')
 
 Name:             php-symfony2-Routing
-Version:          2.0.15
-Release:          3%{?dist}
+Version:          2.0.16
+Release:          1%{?dist}
 Summary:          Symfony2 %{pear_name} Component
 
 Group:            Development/Libraries
@@ -18,14 +19,15 @@ BuildRequires:    php-pear(PEAR)
 BuildRequires:    php-channel(%{pear_channel})
 
 Requires:         php-common >= 5.3.2
-Requires:         php-libxml
-Requires:         php-pcre
-Requires:         php-spl
-Requires:         php-tokenizer
 Requires:         php-pear(PEAR)
 Requires:         php-channel(%{pear_channel})
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
+# phpci requires
+Requires:         php-libxml
+Requires:         php-pcre
+Requires:         php-spl
+Requires:         php-tokenizer
 # Optional requires
 Requires:         php-pear(%{pear_channel}/Config) = %{version}
 Requires:         php-pear(%{pear_channel}/Yaml) = %{version}
@@ -41,17 +43,9 @@ The Routing Component maps an HTTP request to a set of configuration variables.
 # package.xml is version 2.0
 mv package.xml %{pear_name}-%{version}/%{name}.xml
 
-# Fix package.xml for *.xsd file incorrectly being identified with role="doc"
-# instead of role="php" (the *.xsd file is being referenced in code and is
-# expected to be in the install directory instead of the doc directory)
-# *** NOTE: This needs to be fixed upstream
-sed -i \
-    's#<file *md5sum="\([^"]\{1,\}\)" *name="\([^"]\{1,\}.xsd\)" *role="doc" */>#<file md5sum="\1" name="\2" role="php" />#' \
-    %{pear_name}-%{version}/%{name}.xml
-
 
 %build
-# Empty build section, most likely nothing required.
+# Empty build section, nothing required
 
 
 %install
@@ -86,7 +80,15 @@ fi
 
 
 %changelog
-* Mon Jul 21 2012 Remi Collet <RPMS@FamilleCollet.com> 2.0.15-3
+* Fri Jul 20 2012 Remi Collet <RPMS@FamilleCollet.com> 2.0.16-1
+- Update to 2.0.16, backport for remi repository
+
+* Wed Jul 18 2012 Shawn Iwinski <shawn.iwinski@gmail.com> 2.0.16-1
+- Updated to upstream version 2.0.16
+- Removed fix package.xml for *.xsd file issue (fixed upstream)
+- Minor syntax updates
+
+* Mon Jun 21 2012 Remi Collet <RPMS@FamilleCollet.com> 2.0.15-3
 - backport for remi repository
 
 * Tue Jun 12 2012 Shawn Iwinski <shawn.iwinski@gmail.com> 2.0.15-3
-- 
cgit