From 18866a42d17cea67bcbbaf31ab26fdc3cce3efa5 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 6 Mar 2013 10:55:42 +0100
Subject: php-symfony2-Form: 2.2.0

---
 php-symfony2-Form.spec | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

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

diff --git a/php-symfony2-Form.spec b/php-symfony2-Form.spec
index eafe797..7de6f2d 100644
--- a/php-symfony2-Form.spec
+++ b/php-symfony2-Form.spec
@@ -5,7 +5,7 @@
 %global php_min_ver  5.3.3
 
 Name:             php-symfony2-Form
-Version:          2.1.8
+Version:          2.2.0
 Release:          1%{?dist}
 Summary:          Symfony2 %{pear_name} Component
 
@@ -13,7 +13,6 @@ Group:            Development/Libraries
 License:          MIT
 URL:              http://symfony.com/components
 Source0:          http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-Patch0:           %{name}-tests-bootstrap.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
@@ -22,11 +21,12 @@ BuildRequires:    php-channel(%{pear_channel})
 # Test requires
 BuildRequires:    php(language) >= %{php_min_ver}
 BuildRequires:    php-pear(pear.phpunit.de/PHPUnit)
-BuildRequires:    php-pear(%{pear_channel}/EventDispatcher) >= 2.1.0
-BuildRequires:    php-pear(%{pear_channel}/Locale) >= 2.1.0
-BuildRequires:    php-pear(%{pear_channel}/OptionsResolver) >= 2.1.0
-BuildRequires:    php-pear(%{pear_channel}/HttpFoundation) >= 2.1.0
-BuildRequires:    php-pear(%{pear_channel}/Validator) >= 2.1.0
+BuildRequires:    php-pear(%{pear_channel}/EventDispatcher) >= 2.2.0
+BuildRequires:    php-pear(%{pear_channel}/Locale) >= 2.2.0
+BuildRequires:    php-pear(%{pear_channel}/OptionsResolver) >= 2.2.0
+BuildRequires:    php-pear(%{pear_channel}/HttpFoundation) >= 2.2.0
+BuildRequires:    php-pear(%{pear_channel}/Validator) >= 2.2.0
+BuildRequires:    php-pear(%{pear_channel}/PropertyAccess) >= 2.2.0
 # Test requires: phpci
 BuildRequires:    php-ctype
 BuildRequires:    php-date
@@ -41,9 +41,10 @@ BuildRequires:    php-spl
 Requires:         php(language) >= %{php_min_ver}
 Requires:         php-pear(PEAR)
 Requires:         php-channel(%{pear_channel})
-Requires:         php-pear(%{pear_channel}/EventDispatcher) >= 2.1.0
-Requires:         php-pear(%{pear_channel}/Locale) >= 2.1.0
-Requires:         php-pear(%{pear_channel}/OptionsResolver) >= 2.1.0
+Requires:         php-pear(%{pear_channel}/EventDispatcher) >= 2.2.0
+Requires:         php-pear(%{pear_channel}/Locale) >= 2.2.0
+Requires:         php-pear(%{pear_channel}/OptionsResolver) >= 2.2.0
+Requires:         php-pear(%{pear_channel}/PropertyAccess) >= 2.2.0
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 # phpci requires
@@ -57,8 +58,8 @@ Requires:         php-reflection
 Requires:         php-session
 Requires:         php-spl
 # Optional requires
-Requires:         php-pear(%{pear_channel}/HttpFoundation) >= 2.1.0
-Requires:         php-pear(%{pear_channel}/Validator) >= 2.1.0
+Requires:         php-pear(%{pear_channel}/HttpFoundation) >= 2.2.0
+Requires:         php-pear(%{pear_channel}/Validator) >= 2.2.0
 
 Provides:         php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -71,11 +72,6 @@ component.
 %prep
 %setup -q -c
 
-# Patches
-cd %{pear_name}-%{version}
-%patch0 -p0
-cd ..
-
 # Modify PEAR package.xml file:
 # - Remove .gitignore file
 # - Change role from "php" to "doc" for CHANGELOG.md file
@@ -85,7 +81,6 @@ sed -e '/\.gitignore/d' \
     -e '/CHANGELOG.md/s/role="php"/role="doc"/' \
     -e '/phpunit.xml.dist/s/role="php"/role="test"/' \
     -e '/Tests/s/role="php"/role="test"/' \
-    -e '/bootstrap.php/s/md5sum="[^"]*"\s*//' \
     -i package.xml
 
 # package.xml is version 2.0
@@ -107,11 +102,17 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
 mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
+sed -e '/bootstrap/s:vendor/autoload.php:%{pear_phpdir}/Symfony/Component/%{pear_name}/autoloader.php:' \
+      %{buildroot}%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/phpunit.xml.dist \
+    > %{buildroot}%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/phpunit.xml
+
 
 %check
 %if 0%{?fedora} > 13
 cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
-%{_bindir}/phpunit
+sed -e '/bootstrap/s:vendor/autoload.php:autoloader.php:' \
+    phpunit.xml.dist > phpunit.xml
+%{_bindir}/phpunit -d date.timezone=UTC
 %else
 : Test temporary disabled on EL
 %endif
@@ -138,6 +139,10 @@ fi
 
 
 %changelog
+* Wed Mar 06 2013 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- new dependency on PropertyAccess
+
 * Wed Feb 27 2013 Remi Collet <remi@fedoraproject.org> - 2.1.8-1
 - Update to 2.1.8
 
-- 
cgit