[php-symfony2-DependencyInjection] Fix package.xml for *.xsd file issue

Shawn Iwinski siwinski at fedoraproject.org
Wed Jun 13 05:15:04 UTC 2012


commit 0f9a2d6cd3705961302de1617e238e585fc04516
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Wed Jun 13 01:14:35 2012 -0400

    Fix package.xml for *.xsd file issue

 php-symfony2-DependencyInjection.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/php-symfony2-DependencyInjection.spec b/php-symfony2-DependencyInjection.spec
index 324b7ce..e2540c5 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
@@ -25,10 +25,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}
 
@@ -45,6 +46,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.
@@ -81,6 +90,9 @@ fi
 
 
 %changelog
+* Tue Jun 12 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.0.15-3
+- Fix package.xml for *.xsd file issue
+
 * Sat Jun 9 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.0.15-2
 - Added php-pear(%%{pear_channel}/Config) require
 - Added php-pear(%%{pear_channel}/Yaml) require


More information about the scm-commits mailing list