[php-symfony-icu] Added conflicts

[Shawn Iwinski]

commit 7a57f0f0fa891298140fb3c0f37ef08216a771db
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Wed Nov 27 12:09:48 2013 -0500

    Added conflicts
    
    - Minor comments and description updates

 php-symfony-icu.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/php-symfony-icu.spec b/php-symfony-icu.spec
index 052a0f9..6679ad2 100644
--- a/php-symfony-icu.spec
+++ b/php-symfony-icu.spec
@@ -12,15 +12,12 @@
 
 %global symfony_dir           %{_datadir}/php/Symfony
 
-# Tests are only run with rpmbuild --with tests
-#
-# Will be run by default when the required php-symfony-intl pkg
-# version is available
+# Tests are only run with rpmbuild --with tests to avoid circular dependency
 %global with_tests  %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-symfony-icu
 Version:        %{github_version}
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Symfony Icu Component
 
 Group:          Development/Libraries
@@ -42,18 +39,25 @@ Requires:       php-intl
 
 Requires:       libicu           >= %{libicu_min_ver}
 Requires:       php(language)    >= %{php_min_ver}
-# Disabled until the required php-symfony-intl pkg version is available
-#Requires:       php-symfony-intl >= %%{symfony_intl_min_ver}
-#Requires:       php-symfony-intl <  %%{symfony_intl_max_ver}
 # phpcompatinfo
 Requires:       php-ctype
 Requires:       php-intl
 
+# Disabled to prevent circular dependency
+#Requires:       php-symfony-intl >= %%{symfony_intl_min_ver}
+#Requires:       php-symfony-intl <  %%{symfony_intl_max_ver}
+# Ensure conflicting versions are not installed
+Conflicts:      php-symfony-intl <  %{symfony_intl_min_ver}
+Conflicts:      php-symfony-intl >= %{symfony_intl_max_ver}
+
 %description
 Contains data of the ICU library.
 
-You should not directly use this component. Use it through the API of the Intl
-component instead.
+You should not directly use this component. Use it through the API of the
+Symfony Intl component instead.
+
+NOTE: This package requires the Symfony Intl package (>= %{symfony_intl_min_ver}, < %{symfony_intl_max_ver})
+      but does not explicitly require it to prevent a circular dependency.
 
 
 %prep
@@ -128,6 +132,10 @@ cat phpunit.xml.dist \
 
 
 %changelog
+* Wed Nov 27 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.0-3
+- Added conflicts
+- Minor comments and description updates
+
 * Mon Nov 18 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.0-2
 - Renamed from "php-symfony2-icu" to "php-symfony-icu"
 - Direct libicu dependency instead of using pkgconfig