[php-symfony-symfony] - upstream 1.4.18 (security fix) - fix doctrine path - fix php dependency

[Christof Damian]

commit 32d73113aa76608818d2e2f3bd698e51c6f154d9
Author: Christof Damian <christof at damian.net>
Date:   Mon Jun 4 19:43:02 2012 +0200

    - upstream 1.4.18 (security fix)
    - fix doctrine path
    - fix php dependency

 .gitignore               |    1 +
 php-symfony-symfony.spec |   19 ++++++++++++++-----
 sources                  |    2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db7e47e..4b64a92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /symfony-1.4.8.tgz
 /symfony-1.4.17.tgz
+/symfony-1.4.18.tgz
diff --git a/php-symfony-symfony.spec b/php-symfony-symfony.spec
index 8200c09..577d534 100644
--- a/php-symfony-symfony.spec
+++ b/php-symfony-symfony.spec
@@ -2,8 +2,8 @@
 %global pear_name symfony
 
 Name:           php-symfony-symfony
-Version:        1.4.8
-Release:        4%{?dist}
+Version:        1.4.18
+Release:        1%{?dist}
 Summary:        Open-Source PHP Web Framework
 
 Group:          Development/Libraries
@@ -17,11 +17,11 @@ Source1:        symfony.README.fedora
 BuildArch:      noarch
 BuildRequires:  php-channel(pear.symfony-project.com)
 BuildRequires:  php-pear(PEAR)
-Requires:       php >= 5.2.4
+Requires:       php-common >= 5.2.4
 Requires:       php-dom, php-simplexml
 Requires:       php-pear(PEAR)
 Requires:       php-channel(pear.symfony-project.com)
-Requires:       php-doctrine-Doctrine >= 1.2.0
+Requires:       php-doctrine-Doctrine >= 1.2.4
 Requires:       php-pear-phing >= 1.0.0
 #Requires:       php-pear-propel_generator >= 1.4.0
 #Requires:       php-pear-propel_runtime >= 1.4.0
@@ -62,7 +62,7 @@ cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
-sed -i -e "s|dirname.*/lib/vendor/doctrine|'%{pear_phpdir}/Doctrine/lib|" \
+sed -i -e "s|dirname.*/lib/vendor/doctrine|'%{pear_phpdir}|" \
     $RPM_BUILD_ROOT%{pear_phpdir}/%{pear_name}/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php 
 
 sed -i -e "s|sfConfig::get.*sf_symfony_lib_dir.*/vendor/swiftmailer|'%{pear_phpdir}/Swift|" \
@@ -134,6 +134,15 @@ fi
 %{_bindir}/symfony
 
 %changelog
+* Mon Jun  4 2012 Christof Damian <christof at damian.net> - 1.4.18-1
+- upstream 1.4.18 (security fix)
+
+* Thu Mar  8 2012 Christof Damian <christof at damian.net> - 1.4.17-2
+- fix doctrine path
+
+* Thu Mar  8 2012 Christof Damian <christof at damian.net> - 1.4.17-1
+- upstream 1.4.17
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b34169..50da501 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1837e9fc5167c891dbd4536212db863  symfony-1.4.17.tgz
+b911b24135563dbc332b825e31646bc6  symfony-1.4.18.tgz