summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-06-13 18:34:06 +0200
committerRemi Collet <fedora@famillecollet.com>2012-06-13 18:34:06 +0200
commit68a720df6d3c75e73bd1a26d948ac242b79c0b6d (patch)
treeefba78e4fa3c23b6770bf96e7c05c08959cdd55b
parentea899bf5d0aa9a2910d7fa852b7c728d4b2c85e2 (diff)
php-symfony2-DependencyInjection: sync with rawhide
-rw-r--r--php-symfony2-DependencyInjection.spec21
1 files changed, 18 insertions, 3 deletions
diff --git a/php-symfony2-DependencyInjection.spec b/php-symfony2-DependencyInjection.spec
index 7751390..35ca140 100644
--- a/php-symfony2-DependencyInjection.spec
+++ b/php-symfony2-DependencyInjection.spec
@@ -4,7 +4,7 @@
Name: php-symfony2-DependencyInjection
Version: 2.0.15
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Symfony2 %{pear_name} Component
Group: Development/Libraries
@@ -26,10 +26,11 @@ Requires: php-spl
Requires: php-simplexml
Requires: php-pear(PEAR)
Requires: php-channel(%{pear_channel})
-Requires: php-pear(%{pear_channel}/Config) = %{version}
-Requires: php-pear(%{pear_channel}/Yaml) = %{version}
Requires(post): %{__pear}
Requires(postun): %{__pear}
+# Optional requires
+Requires: php-pear(%{pear_channel}/Config) = %{version}
+Requires: php-pear(%{pear_channel}/Yaml) = %{version}
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -46,6 +47,14 @@ Service Container (http://symfony.com/doc/current/book/service_container.html).
# 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.
@@ -83,6 +92,12 @@ fi
%changelog
+* Wed Jun 13 2012 Remi Collet <RPMS@FamilleCollet.com> 2.0.15-3
+- rebuild for remi repository
+
+* Tue Jun 12 2012 Shawn Iwinski <shawn.iwinski@gmail.com> 2.0.15-3
+- Fix package.xml for *.xsd file issue
+
* Sun Jun 09 2012 Remi Collet <RPMS@FamilleCollet.com> 2.0.15-2
- rebuild for remi repository