summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2008-11-25 22:54:32 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2008-11-25 22:54:32 (GMT)
commita09861ee7cb82a82b3bfa389b3eb3f9e038298a1 (patch)
treee4b1b3c991d06a50537a391f8ae46639e45a4046 /pear
parentff741995ed1ba01bc7469fc7918dfd7798512fb5 (diff)
downloadserver-a09861ee7cb82a82b3bfa389b3eb3f9e038298a1.tar.gz
Indicate package conflicts / package replacements between Kolab-Server-2.2.0 and Kolab-Server-2.2.1.
Diffstat (limited to 'pear')
-rw-r--r--pear/Horde_Argv/Horde_Argv.spec2
-rw-r--r--pear/Horde_Auth/Horde_Auth.spec2
-rw-r--r--pear/Horde_Browser/Horde_Browser.spec2
-rw-r--r--pear/Horde_CLI/Horde_CLI.spec2
-rw-r--r--pear/Horde_Cache/Horde_Cache.spec2
-rw-r--r--pear/Horde_Cipher/Horde_Cipher.spec2
-rw-r--r--pear/Horde_DOM/Horde_DOM.spec2
-rw-r--r--pear/Horde_DataTree/Horde_DataTree.spec2
-rw-r--r--pear/Horde_Date/Horde_Date.spec2
-rw-r--r--pear/Horde_Framework/Horde_Framework.spec2
-rw-r--r--pear/Horde_Group/Horde_Group.spec2
-rw-r--r--pear/Horde_History/Horde_History.spec2
-rw-r--r--pear/Horde_LDAP/Horde_LDAP.spec2
-rw-r--r--pear/Horde_MIME/Horde_MIME.spec2
-rw-r--r--pear/Horde_NLS/Horde_NLS.spec2
-rw-r--r--pear/Horde_Perms/Horde_Perms.spec2
-rw-r--r--pear/Horde_Secret/Horde_Secret.spec2
-rw-r--r--pear/Horde_Serialize/Horde_Serialize.spec2
-rw-r--r--pear/Horde_SessionObjects/Horde_SessionObjects.spec2
-rw-r--r--pear/Horde_Util/Horde_Util.spec2
-rw-r--r--pear/Horde_iCalendar/Horde_iCalendar.spec2
-rw-r--r--pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec2
-rw-r--r--pear/PEAR-Mail-mimeDecode/PEAR-Mail_mimeDecode.spec3
23 files changed, 47 insertions, 0 deletions
diff --git a/pear/Horde_Argv/Horde_Argv.spec b/pear/Horde_Argv/Horde_Argv.spec
index 9b90fad..f43037b 100644
--- a/pear/Horde_Argv/Horde_Argv.spec
+++ b/pear/Horde_Argv/Horde_Argv.spec
@@ -29,6 +29,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
This package provides classes for parsing command line arguments with
various actions, providing help, grouping options, and more.
diff --git a/pear/Horde_Auth/Horde_Auth.spec b/pear/Horde_Auth/Horde_Auth.spec
index 1b4ea16..def1287 100644
--- a/pear/Horde_Auth/Horde_Auth.spec
+++ b/pear/Horde_Auth/Horde_Auth.spec
@@ -32,6 +32,8 @@ PreReq: Horde_Framework
PreReq: Horde_Secret
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
The Auth:: class provides a common abstracted interface into the
various backends for the Horde authentication system. This package
diff --git a/pear/Horde_Browser/Horde_Browser.spec b/pear/Horde_Browser/Horde_Browser.spec
index 3c4d988..e4ef9f1 100644
--- a/pear/Horde_Browser/Horde_Browser.spec
+++ b/pear/Horde_Browser/Horde_Browser.spec
@@ -29,6 +29,8 @@ PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
The Horde_Browser:: class provides an API for getting information
about the current users browser and its capabilities.
diff --git a/pear/Horde_CLI/Horde_CLI.spec b/pear/Horde_CLI/Horde_CLI.spec
index 59f68ed..df571fc 100644
--- a/pear/Horde_CLI/Horde_CLI.spec
+++ b/pear/Horde_CLI/Horde_CLI.spec
@@ -28,6 +28,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
Horde_CLI:: API for basic command-line functionality/checks.
diff --git a/pear/Horde_Cache/Horde_Cache.spec b/pear/Horde_Cache/Horde_Cache.spec
index 78fa5bb..29178bb 100644
--- a/pear/Horde_Cache/Horde_Cache.spec
+++ b/pear/Horde_Cache/Horde_Cache.spec
@@ -29,6 +29,8 @@ PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
This package provides a simple, functional Caching API, with the
option to store the cached data either on the filesystem, or using the
diff --git a/pear/Horde_Cipher/Horde_Cipher.spec b/pear/Horde_Cipher/Horde_Cipher.spec
index 31fe599..a48f115 100644
--- a/pear/Horde_Cipher/Horde_Cipher.spec
+++ b/pear/Horde_Cipher/Horde_Cipher.spec
@@ -28,6 +28,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
This package provides a Block Mode Cipher API, supporting the following ciphers:
* Blowfish
diff --git a/pear/Horde_DOM/Horde_DOM.spec b/pear/Horde_DOM/Horde_DOM.spec
index f95847b..e9093d6 100644
--- a/pear/Horde_DOM/Horde_DOM.spec
+++ b/pear/Horde_DOM/Horde_DOM.spec
@@ -28,6 +28,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
These classes allow the use of code written for PHP4's domxml
implementation to work using PHP5's dom implementation.
diff --git a/pear/Horde_DataTree/Horde_DataTree.spec b/pear/Horde_DataTree/Horde_DataTree.spec
index 009094b..fd190cc 100644
--- a/pear/Horde_DataTree/Horde_DataTree.spec
+++ b/pear/Horde_DataTree/Horde_DataTree.spec
@@ -31,6 +31,8 @@ PreReq: Horde_Framework
PreReq: Horde_Serialize
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
None.
diff --git a/pear/Horde_Date/Horde_Date.spec b/pear/Horde_Date/Horde_Date.spec
index cdc0149..c1aca74 100644
--- a/pear/Horde_Date/Horde_Date.spec
+++ b/pear/Horde_Date/Horde_Date.spec
@@ -29,6 +29,8 @@ PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
PreReq: PEAR-Date
+Conflicts: horde-framework-kolab
+
%description
Package for creating and manipulating dates.
diff --git a/pear/Horde_Framework/Horde_Framework.spec b/pear/Horde_Framework/Horde_Framework.spec
index 3ad5f29..1b859ab 100644
--- a/pear/Horde_Framework/Horde_Framework.spec
+++ b/pear/Horde_Framework/Horde_Framework.spec
@@ -32,6 +32,8 @@ PreReq: Horde_CLI
PreReq: Horde_DOM
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
These classes provide the core functionality of the Horde Application
Framework.
diff --git a/pear/Horde_Group/Horde_Group.spec b/pear/Horde_Group/Horde_Group.spec
index fe09fa2..48c7140 100644
--- a/pear/Horde_Group/Horde_Group.spec
+++ b/pear/Horde_Group/Horde_Group.spec
@@ -32,6 +32,8 @@ PreReq: Horde_Framework
PreReq: Horde_DataTree
PreReq: Horde_Auth
+Conflicts: horde-framework-kolab
+
%description
The Group:: class provides the Horde groups system.
diff --git a/pear/Horde_History/Horde_History.spec b/pear/Horde_History/Horde_History.spec
index 306f544..61dfb20 100644
--- a/pear/Horde_History/Horde_History.spec
+++ b/pear/Horde_History/Horde_History.spec
@@ -28,6 +28,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
This API provides a way to track changes on arbitrary pieces of data
in Horde applications.
diff --git a/pear/Horde_LDAP/Horde_LDAP.spec b/pear/Horde_LDAP/Horde_LDAP.spec
index ea71bfe..14e5afb 100644
--- a/pear/Horde_LDAP/Horde_LDAP.spec
+++ b/pear/Horde_LDAP/Horde_LDAP.spec
@@ -28,6 +28,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
Horde_LDAP:: contains some utility functions for dealing with LDAP
servers and data.
diff --git a/pear/Horde_MIME/Horde_MIME.spec b/pear/Horde_MIME/Horde_MIME.spec
index beb30bc..767dff5 100644
--- a/pear/Horde_MIME/Horde_MIME.spec
+++ b/pear/Horde_MIME/Horde_MIME.spec
@@ -30,6 +30,8 @@ PreReq: php, php::with_pear = yes
PreReq: PEAR-Mail_mimeDecode
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
The Horde_MIME:: class provides methods for dealing with MIME standards.
diff --git a/pear/Horde_NLS/Horde_NLS.spec b/pear/Horde_NLS/Horde_NLS.spec
index 6a96ac7..f5cd538 100644
--- a/pear/Horde_NLS/Horde_NLS.spec
+++ b/pear/Horde_NLS/Horde_NLS.spec
@@ -30,6 +30,8 @@ PreReq: php, php::with_pear = yes
PreReq: Horde_Browser
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
Localization package.
diff --git a/pear/Horde_Perms/Horde_Perms.spec b/pear/Horde_Perms/Horde_Perms.spec
index cfb6b10..e681b8a 100644
--- a/pear/Horde_Perms/Horde_Perms.spec
+++ b/pear/Horde_Perms/Horde_Perms.spec
@@ -32,6 +32,8 @@ PreReq: Horde_Framework
PreReq: Horde_Group
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
The Perms package provides an interface to the Horde permissions
system.
diff --git a/pear/Horde_Secret/Horde_Secret.spec b/pear/Horde_Secret/Horde_Secret.spec
index 3d295e2..a89c344 100644
--- a/pear/Horde_Secret/Horde_Secret.spec
+++ b/pear/Horde_Secret/Horde_Secret.spec
@@ -30,6 +30,8 @@ PreReq: php, php::with_pear = yes
PreReq: Horde_Cipher
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
The Secret:: class provides an API for encrypting and decrypting small
pieces of data with the use of a shared key.
diff --git a/pear/Horde_Serialize/Horde_Serialize.spec b/pear/Horde_Serialize/Horde_Serialize.spec
index 57ae1b8..331f200 100644
--- a/pear/Horde_Serialize/Horde_Serialize.spec
+++ b/pear/Horde_Serialize/Horde_Serialize.spec
@@ -29,6 +29,8 @@ PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
The Serialize:: class provides various methods of encapsulating data.
diff --git a/pear/Horde_SessionObjects/Horde_SessionObjects.spec b/pear/Horde_SessionObjects/Horde_SessionObjects.spec
index 69dec9b..3c16a3d 100644
--- a/pear/Horde_SessionObjects/Horde_SessionObjects.spec
+++ b/pear/Horde_SessionObjects/Horde_SessionObjects.spec
@@ -30,6 +30,8 @@ PreReq: php, php::with_pear = yes
PreReq: Horde_Framework
PreReq: Horde_Serialize
+Conflicts: horde-framework-kolab
+
%description
The Horde_SessionObjects:: class provides a way for storing data
(usually, but not necessarily, objects) in the current users session.
diff --git a/pear/Horde_Util/Horde_Util.spec b/pear/Horde_Util/Horde_Util.spec
index 211589c..e03ea0e 100644
--- a/pear/Horde_Util/Horde_Util.spec
+++ b/pear/Horde_Util/Horde_Util.spec
@@ -29,6 +29,8 @@ BuildPreReq: PEAR-Horde-Channel
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: horde-framework-kolab
+
%description
These classes provide functionality useful for all kind of applications.
diff --git a/pear/Horde_iCalendar/Horde_iCalendar.spec b/pear/Horde_iCalendar/Horde_iCalendar.spec
index cb48cd0..5f86c5e 100644
--- a/pear/Horde_iCalendar/Horde_iCalendar.spec
+++ b/pear/Horde_iCalendar/Horde_iCalendar.spec
@@ -30,6 +30,8 @@ PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
PreReq: Horde_Util
+Conflicts: horde-framework-kolab
+
%description
This package provides an API for dealing with iCalendar data.
diff --git a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
index 52912a7..69e691a 100644
--- a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
+++ b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
@@ -17,6 +17,8 @@ BuildRoot: %{l_buildroot}
BuildPreReq: php, php::with_pear = yes
Requires: php, php::with_pear = yes
+Obsoletes: php-channel-horde
+
%description
This package adds the pear.horde.org channel which allows PEAR packages
from this channel to be installed.
diff --git a/pear/PEAR-Mail-mimeDecode/PEAR-Mail_mimeDecode.spec b/pear/PEAR-Mail-mimeDecode/PEAR-Mail_mimeDecode.spec
index 67a0392..33c7123 100644
--- a/pear/PEAR-Mail-mimeDecode/PEAR-Mail_mimeDecode.spec
+++ b/pear/PEAR-Mail-mimeDecode/PEAR-Mail_mimeDecode.spec
@@ -28,6 +28,9 @@ BuildPreReq: php, php::with_pear = yes
PreReq: OpenPKG, openpkg >= 20070603
PreReq: php, php::with_pear = yes
+Conflicts: PEAR-Mail_Mime <= 1.3.0
+
+
%description
Provides a class to deal with the decoding and interpreting of mime
messages. This package used to be part of the Mail_Mime package, but