php-horde-Horde-Timezone: fix BR

remicollet · Jun 30, 2013 · d905c96 · d905c96
1 parent 9504627
commit d905c96
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/php/horde/buildorder b/php/horde/buildorder
@@ -83,7 +83,7 @@ Build order
 	Horde_Alarm               2.0.4      BR: Horde_Test, Horde_Date  R: Horde_Date, Horde_Exception, Horde_Translation, Horde_Db, Horde_Log, Horde_Mail, Horde_Mime, Horde_Notification, Horde_Perms, Horde_Prefs
 	Horde_Data                2.0.4      BR: Horde_Test  R: Horde_Browser, Horde_Exception, Horde_Icalendar, Horde_Mail, Horde_Mime, Horde_Translation, Horde_Util
 	Horde_Itip                2.0.5      BR: Horde_Test, Horde_Icalendar  R: Horde_Icalendar, Horde_Mime, Horde_Prefs
-	Horde_Timezone            1.0.3      BR: Horde_Test, Horde_Date  R: Horde_Date, Horde_Icalendar, Horde_Vfs
+	Horde_Timezone            1.0.3      BR: Horde_Test, Horde_Date, Horde_Icalendar  R: Horde_Date, Horde_Icalendar, Horde_Vfs
 	Horde_Core                2.6.0      BR: Horde_Role, Horde_Test, Horde_Url, Horde_Injector, Horde_Group I: Horde_Dav R: Horde_Role, Horde_Alarm, Horde_Auth, Horde_Autoloader, Horde_Browser, Horde_Cache, Horde_Cli, Horde_Compress, Horde_Compress_Fast, Horde_Controller, Horde_Data, Horde_Date, Horde_Exception, Horde_Group, Horde_History, Horde_Injector, Horde_Lock, Horde_Log, Horde_LoginTasks, Horde_Mime, Horde_Mime_Viewer, Horde_Notification, Horde_Perms, Horde_Prefs, Horde_Secret, Horde_Serialize, Horde_SessionHandler, Horde_Share, Horde_Support, Horde_Template, Horde_Token, Horde_Text_Filter, Horde_Css_Parser, Horde_Translation, Horde_Url, Horde_Util, Horde_View, Horde_Crypt, Horde_Editor, Horde_ElasticSearch, Horde_Form, Horde_Kolab_Server, Horde_Kolab_Session, Horde_Oauth, Horde_Queue, Horde_SpellChecker, Horde_Vfs
 	Horde_Dav                 1.0.0        R: Horde_Auth, Horde_Core, Horde_Stream
 	Horde_Rpc                 2.1.0        R: Horde_Core, Horde_Dav, Horde_Exception, Horde_Perms, Horde_Serialize, Horde_Support, Horde_Translation, Horde_Util, Horde_Xml_Element, Horde_SyncMl

diff --git a/php/horde/php-horde-Horde-Timezone/php-horde-Horde-Timezone.spec b/php/horde/php-horde-Horde-Timezone/php-horde-Horde-Timezone.spec
@@ -1,11 +1,19 @@
+# spec file for php-horde-Horde-Timezone
+#
+# Copyright (c) 2013 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name    Horde_Timezone
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Timezone
 Version:        1.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Timezone library
 
 Group:          Development/Libraries
@@ -22,6 +30,7 @@ BuildRequires:  php-channel(%{pear_channel})
 # To run unit tests
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -30,11 +39,11 @@ Requires:       php-pcre
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Date) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Date) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Icalendar) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Icalendar) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Vfs) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Vfs) < 3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -98,6 +107,9 @@ fi
 
 
 %changelog
+* Sun Jun 07 2013 Remi Collet <remi@fedoraproject.org> - 1.0.3-2
+- BR Horde_Icalendar for test
+
 * Tue May 07 2013 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
 - Update to 1.0.3