up to 1.12.18 (Apr 13, 2016)

[packages/ZendFramework.git] / ZendFramework.spec

diff --git a/ZendFramework.spec b/ZendFramework.spec
index 566f957799b82eafd692826f937e15792bb8947d..ad51a02bbe91f04ddaacf9d4829365a0aa5ee680 100644 (file)
--- a/ZendFramework.spec
+++ b/ZendFramework.spec
@@ -1,5 +1,5 @@
-# TODO
-# - drop pear autogenerated deps and fill deps based on official doc:
+# NOTE
+# - dependencies are filled according to official doc:
 #   http://framework.zend.com/manual/1.12/en/requirements.introduction.html
 #
 # Conditional build:
@@ -13,14 +13,15 @@
 Summary:       Zend Framework
 Summary(pl.UTF-8):     Szkielet Zend
 Name:          ZendFramework
-Version:       1.12.11
+Version:       1.12.18
 Release:       1
 License:       New BSD License
 Group:         Development/Languages/PHP
+# Source0Download: http://framework.zend.com/downloads/latest#ZF1
 Source0:       http://framework.zend.com/releases/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fb05390d22bb0ab9b340c456c4b25af5
+# Source0-md5: 1daccfdf08e5b5bc9556e093a577b246
 Source1:       http://framework.zend.com/releases/%{name}-%{version}/%{name}-%{version}-manual-en.tar.gz
-# Source1-md5: ca6ab6b20ca0a0f32b680c8111404286
+# Source1-md5: 5808327b75666c246dc1e6e0f0596795
 Source2:       %{name}-find-lang.sh
 Patch0:                %{name}-additional-locales.patch
 Patch1:                %{name}-deps.patch
@@ -36,20 +37,14 @@ Obsoletes:  ZendFramework-doc
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# bad depsolver
-%define                _noautopear     pear(../application/bootstrap.php)
-
-# bad code
-%define                _bad_deps_1_10 Zend/Pdf/FileParser/Image/Jpeg.php Zend/Pdf/FileParser/Image/Tiff.php
-%define                _bad_deps_1_10_2 Zend/Serializer/Excception.php Zend/Services/DeveloperGarden/Response/Exception.php
-%define                _bad_deps_1_12_1 Zend/Service/Rackspace/Exception.php Zend/Service/Rackspace/Files.php Exception/InvalidArgumentException.php Zend/Loader/Exception/../Exception.php Zend/Service/Console/Command.php Zend/Service/Console/Exception.php Zend/Service/Log/Exception.php Zend/Service/Log/Formatter/Interface.php Zend/Service/Log/Writer/Abstract.php Zend/Service/Management/Exception.php
-%define                _noautoreq_pear %{?_bad_deps_1_10} %{?_bad_deps_1_10_2} %{?_bad_deps_1_12_1}
+# disable PEAR dependency solving in requirements, while we still do Provide them
+%define                _noautoreq_pear Zend/.*
 
 # exclude optional php dependencies
 %define                _noautophp      php-oci8 php-bitset
 
 # put it together for rpmbuild
-%define                _noautoreq      %{?_noautophp} %{?_noautopear} %{?_noautodeps}
+%define                _noautoreq      %{?_noautophp}
 
 %description
 Zend Framework is a high quality and open source framework for
@@ -73,6 +68,7 @@ Summary(pl.UTF-8):    Zend_Acl - listy kontroli dostępu i zarządzanie uprawnienia
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.acl.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Acl
 Zend_Acl provides lightweight and flexible access control list (ACL)
@@ -92,6 +88,14 @@ Summary(pl.UTF-8):   Zend_Amf - obsługa formatu AMF (Action Message Format)
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.amf.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Acl = %{version}-%{release}
+Requires:      %{name}-Zend_Auth = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Reflection = %{version}-%{release}
+Requires:      %{name}-Zend_Server = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
+Requires:      php(dom)
+Suggests:      php(simplexml)
 
 %description Zend_Amf
 Zend_Amf provides support for Adobe's Action Message Format (AMF), to
@@ -112,6 +116,9 @@ Summary:    Zend_Application - bootstrap facility
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.amf.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Suggests:      php(date)
 
 %description Zend_Application
 Zend_Application provides a bootstrapping facility for applications
@@ -125,8 +132,11 @@ Summary(pl.UTF-8): Zend_Auth - API do uwierzytelniania
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.auth.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Db = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 Requires:      php(ctype)
-# Zend_Auth_Adapter_Http has hard dependency on hash
+Suggests:      php(hash)
+# Zend_Auth_Adapter_Http requires hash
 
 %description Zend_Auth
 Zend_Auth provides an API for authentication and includes concrete
@@ -142,6 +152,8 @@ Summary(pl.UTF-8):  Zend_Barcode - generator kodów kreskowych
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.barcode.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Validate = %{version}-%{release}
 
 %description Zend_Barcode
 Zend_Barcode provides a generic way to generate barcodes. The
@@ -162,7 +174,14 @@ Summary(pl.UTF-8): Zend_Cache - pamięć podręczna dla danych
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.cache.html
 Requires:      %{name} = %{version}-%{release}
-# Zend_Cache_Backend_Apc hard dep on php-pecl-APC
+Suggests:      php(apc)
+Suggests:      php(memcache)
+Suggests:      php(memcached)
+Suggests:      php(sqlite)
+# Zend_Cache_Backend_Apc requires apc
+# Zend_Cache_Backend_Memcached requires memcache
+# Zend_Cache_Backend_Libmemcached requires memcached
+# Zend_Cache_Backend_Sqlite requires sqlite
 
 %description Zend_Cache
 Zend_Cache provides a flexible approach toward caching data, including
@@ -178,6 +197,11 @@ Summary(pl.UTF-8): Zend_Captcha - funkcjonalność CAPTCHA
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.captcha.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Service_ReCaptcha = %{version}-%{release}
+Requires:      %{name}-Zend_Text = %{version}-%{release}
+Requires:      %{name}-Zend_Validate = %{version}-%{release}
+Requires:      php(gd)
 
 %description Zend_Captcha
 CAPTCHA stands for "Completely Automated Turing test to tell Computers
@@ -207,6 +231,7 @@ Summary:    Zend_Cloud - SimpleCloud API
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.cloud.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Cloud
 SimpleCloud API
@@ -216,6 +241,7 @@ Summary:    Zend_CodeGenerator - generate arbitrary code using OO interface
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.codegenerator.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_CodeGenerator
 Zend_CodeGenerator provides facilities to generate arbitrary code
@@ -231,6 +257,9 @@ Summary(pl.UTF-8):  Zend_Config - dostęp do danych konfiguracyjnych
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.config.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Suggests:      php(simplexml)
+# Zend_Config_Xml requires simplexml
 
 %description Zend_Config
 Zend_Config is designed to simplify access to and use of configuration
@@ -246,6 +275,7 @@ Summary(pl.UTF-8):  Zend_Console_Getopt - analiza opcji i argumentów linii polec
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.console.getopt.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Console_Getopt
 The Zend_Console_Getopt class helps command-line applications to parse
@@ -261,6 +291,14 @@ Summary(pl.UTF-8): Zend_Controller - podstawa systemu Model-View-Controller
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.controller.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Config = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Registry = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
+Requires:      %{name}-Zend_View = %{version}-%{release}
+Requires:      php(reflection)
+Requires:      php(session)
 
 %description Zend_Controller
 Zend_Controller is the heart of Zend Framework's MVC system. MVC
@@ -276,8 +314,9 @@ wyświetlania.
 %package Zend_Crypt
 Summary:       Zend_Crypt
 Group:         Development/Languages/PHP
-URL:           http://framework.zend.com/manual/1.12/en/zend.crypt.html
+#URL:          http://framework.zend.com/manual/1.12/en/zend.crypt.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Crypt
 Zend_Crypt
@@ -288,6 +327,8 @@ Summary(pl.UTF-8):  Zend_Currency - obsługa reprezentacji walut
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.currency.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
 Requires:      php(iconv)
 
 %description Zend_Currency
@@ -310,6 +351,8 @@ Summary(pl.UTF-8):  Zend_Date - operacje na dacie i czasie
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.date.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
 
 %description Zend_Date
 Zend_Date component offers a detailed, but simple API for manipulating
@@ -329,6 +372,19 @@ Summary:   Zend_Db
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.db.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Suggests:      php(mysqli)
+Suggests:      php(pdo-mysql)
+Suggests:      php(pdo-pgsql)
+Suggests:      php(pdo-sqlite)
+# Zend_Db_Adapter_Db2 requires ibm_db2
+# Zend_Db_Adapter_Firebird requires interbase
+# Zend_Db_Adapter_Mysqli requires mysqli
+# Zend_Db_Adapter_Oracle requires oci8
+# Zend_Db_Adapter_Pdo_Mysql requires pdo_mysql
+# Zend_Db_Adapter_Pdo_Pgsql requires pdo_pgsql
+# Zend_Db_Adapter_Pdo_Sqlite requires pdo_sqlite
 
 %description Zend_Db
 Zend_Db and its related classes provide a simple SQL database
@@ -376,6 +432,11 @@ Summary:   Zend_Dojo
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.dojo.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Form = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
+Requires:      %{name}-Zend_Registry = %{version}-%{release}
+Requires:      %{name}-Zend_View = %{version}-%{release}
 
 %description Zend_Dojo
 Zend_Dojo component provides integration with Dojo Toolkit.
@@ -392,6 +453,9 @@ Summary:    Zend_Dom
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.dom.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
+Requires:      php(dom)
 
 %description Zend_Dom
 Zend_Dom provides tools for working with DOM documents and structures.
@@ -426,8 +490,13 @@ Summary:   Zend_Feed
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.feed.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(dom)
 Requires:      php(mbstring)
+Requires:      php(simplexml)
 
 %description Zend_Feed
 Zend_Feed provides functionality for consuming RSS and Atom feeds. It
@@ -442,6 +511,8 @@ Summary:    Zend_File
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.file.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Suggests:      php(apc)
 
 %description Zend_File
 Zend_File enables developers to take control over file uploads and
@@ -456,6 +527,12 @@ Summary:   Zend_Filter
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.filter.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Validate = %{version}-%{release}
+Requires:      php(reflection)
+Suggests:      php(zlib)
+# Zend_Filter_Compress requires zlib
 
 %description Zend_Filter
 Zend_Filter component provides a set of commonly needed data filters.
@@ -480,6 +557,9 @@ Summary:    Zend_Form
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.form.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Filter = %{version}-%{release}
+Requires:      %{name}-Zend_Validate = %{version}-%{release}
 
 %description Zend_Form
 Zend_Form simplifies form creation and handling in your web
@@ -495,6 +575,11 @@ Summary:   Zend_Gdata
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.gdata.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Mime = %{version}-%{release}
+Requires:      %{name}-Zend_Version = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(ctype)
 Requires:      php(dom)
 
@@ -513,8 +598,14 @@ Summary:   Zend_Http
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.http.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
 Requires:      php(ctype)
-# Zend_Http_Client_Adapter_Curl has hard dependency on curl
+Suggests:      php(curl)
+Suggests:      php(fileinfo)
+# Zend_Http_Client_Adapter_Curl requires curl
+# Zend_Http_Client has soft dependency on mime_magic (fileinfo)
 
 %description Zend_Http
 Zend_Http component provides a client for the HTTP protocol. It
@@ -523,23 +614,17 @@ supports:
 - cookies
 - proxy servers.
 
-%package Zend_InfoCard
-Summary:       Zend_InfoCard
-Group:         Development/Languages/PHP
-URL:           http://framework.zend.com/manual/1.12/en/zend.infocard.html
-Requires:      %{name} = %{version}-%{release}
-
-%description Zend_InfoCard
-Zend_InfoCard component implements relying-party support for
-Information Cards. Infomation Cards are used for identity management
-on the internet and authentication of users to web sites (called
-relying parties).
-
 %package Zend_Json
 Summary:       Zend_Json
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.json.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Server = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
+Requires:      php(reflection)
+Suggests:      php(json)
 
 %description Zend_Json
 Zend_Json provides convenience methods for serializing native PHP to
@@ -565,6 +650,7 @@ Summary:    Zend_Layout
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.layout.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Layout
 Zend_Layout implements a classic Two Step View pattern, allowing
@@ -590,6 +676,8 @@ Summary:    Zend_Ldap
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.ldap.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      php(ldap)
 
 %description Zend_Ldap
 Zend_Ldap is a class for performing LDAP operations including but not
@@ -601,6 +689,7 @@ Summary:    Zend_Loader
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.loader.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Loader
 The Zend_Loader class includes methods to help you load files
@@ -611,6 +700,8 @@ Summary:    Zend_Locale
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.locale.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(iconv)
 
 %description Zend_Locale
@@ -627,7 +718,10 @@ Summary:   Zend_Log
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.log.html
 Requires:      %{name} = %{version}-%{release}
-# Zend_Log_Formatter_Xml has hard dependency on dom
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      php(reflection)
+Suggests:      php(dom)
+# Zend_Log_Formatter_Xml requires dom
 
 %description Zend_Log
 Zend_Log is a component for general purpose logging. It supports
@@ -653,6 +747,11 @@ Summary:   Zend_Mail
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.mail.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Mime = %{version}-%{release}
+Requires:      %{name}-Zend_Validate = %{version}-%{release}
+Suggests:      php(posix)
 
 %description Zend_Mail
 Zend_Mail provides generalized functionality to compose and send both
@@ -683,6 +782,9 @@ Summary:    Zend_Measure
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.measure.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
+Requires:      %{name}-Zend_Registry = %{version}-%{release}
 
 %description Zend_Measure
 Zend_Measure component provide a generic and easy way for working with
@@ -697,6 +799,8 @@ Summary:    Zend_Memory
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.memory.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Cache = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Memory
 The Zend_Memory component is intended to manage data in an environment
@@ -713,6 +817,7 @@ Summary:    Zend_Mime
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.mime.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 Requires:      php(iconv)
 
 %description Zend_Mime
@@ -723,6 +828,7 @@ Summary:    Zend_Mobile_Push
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.mobile.push.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 
 %description Zend_Mobile_Push
 Zend_Mobile_Push provides the ability for sending push notifications
@@ -765,6 +871,10 @@ Summary:   Zend_OpenId
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.openid.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Controller = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Session = %{version}-%{release}
 # needed for dh keys: any of these tree can do for
 Suggests:      php(bcmath)
 Suggests:      php(gmp)
@@ -779,6 +889,9 @@ Summary:    Zend_Paginator
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.paginator.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
 
 %description Zend_Paginator
 Zend_Paginator is a flexible component for paginating collections of
@@ -798,6 +911,9 @@ Summary:    Zend_Pdf
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.pdf.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Log = %{version}-%{release}
+Requires:      %{name}-Zend_Memory = %{version}-%{release}
 Requires:      php(ctype)
 Requires:      php(gd)
 Requires:      php(iconv)
@@ -830,6 +946,9 @@ Summary:    Zend_ProgressBar
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.progressbar.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Config = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
 
 %description Zend_ProgressBar
 Zend_ProgressBar is a component to create and update progressbars in
@@ -884,6 +1003,7 @@ Summary:   Zend_Registry
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.registry.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Registry
 The registry is a container for storing objects and values in the
@@ -896,8 +1016,15 @@ Summary:  Zend_Rest
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.rest.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Server = %{version}-%{release}
+Requires:      %{name}-Zend_Service = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(ctype)
 Requires:      php(dom)
+Requires:      php(reflection)
+Requires:      php(simplexml)
 
 %description Zend_Rest
 REST Web Services use service-specific XML formats. These ad-hoc
@@ -913,9 +1040,12 @@ Summary:  Zend_Search_Lucene
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.search.lucene.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(ctype)
 Requires:      php(dom)
 Requires:      php(iconv)
+Suggests:      php(bitset)
 
 %description Zend_Search_Lucene
 Zend_Search_Lucene is a general purpose text search engine. Since it
@@ -934,6 +1064,16 @@ Summary:  Zend_Serializer
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.serializer.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
+Suggests:      php(igbinary)
+Suggests:      php(json)
+Suggests:      php(simplexml)
+Suggests:      php(wddx)
+# Zend_Serializer_Adapter_Igbinary requires igbinary
+# Zend_Serializer_Adapter_Json soft depends on json
+# Zend_Serializer_Adapter_Wddx requires SimpleXML, wddx
 
 %description Zend_Serializer
 Zend_Serializer provides an adapter based interface to simply generate
@@ -945,6 +1085,8 @@ Summary:   Zend_Server
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.server.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      php(spl)
 
 %description Zend_Server
 The Zend_Server family of classes provides functionality for the
@@ -956,6 +1098,7 @@ Summary:   Zend_Server_Reflection
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.server.reflection.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      php(reflection)
 
 %description Zend_Server_Reflection
 Zend_Server_Reflection provides a standard mechanism for performing
@@ -980,6 +1123,10 @@ Summary:  Zend_Service_Akismet
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.akismet.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
+Requires:      %{name}-Zend_Version = %{version}-%{release}
 
 %description Zend_Service_Akismet
 Zend_Service_Akismet provides a client for the Akismet API. The
@@ -1004,6 +1151,10 @@ Summary: Zend_Service_Amazon
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.amazon.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Rest = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(dom)
 
 %description Zend_Service_Amazon
@@ -1021,7 +1172,11 @@ Summary: Zend_Service_Audioscrobbler
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.audioscrobbler.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(iconv)
+Requires:      php(simplexml)
 
 %description Zend_Service_Audioscrobbler
 Zend_Service_Audioscrobbler is a simple API for using the
@@ -1034,6 +1189,12 @@ Summary: Zend_Service_Delicious
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.delicious.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Date = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
+Requires:      %{name}-Zend_Rest = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(dom)
 
 %description Zend_Service_Delicious
@@ -1062,6 +1223,7 @@ Summary:  Zend_Service_Ebay is a simple group of APIs for using eBay web services
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.ebay.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 
 %description Zend_Service_Ebay
 Zend_Service_Ebay is a simple group of APIs for using eBay web
@@ -1075,6 +1237,9 @@ Summary:  Zend_Service_Flickr
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.delicious.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(dom)
 Requires:      php(iconv)
 
@@ -1101,30 +1266,6 @@ The family of Zend_Service_LiveDocx components provides a clean and
 simple interface to the LiveDocx API and additionally offers
 functionality to improve network performance.
 
-%package Zend_Service_Nirvanix
-Summary:       Zend_Service_Nirvanix
-Group:         Development/Languages/PHP
-URL:           http://framework.zend.com/manual/1.12/en/zend.service.nirvanix.html
-Requires:      %{name} = %{version}-%{release}
-
-%description Zend_Service_Nirvanix
-Nirvanix provides an Internet Media File System (IMFS), an Internet
-storage service that allows applications to upload, store and organize
-files and subsequently access them using a standard Web Services
-interface. An IMFS is distributed clustered file system, accessed over
-the Internet, and optimized for dealing with media files (audio,
-video, etc). The goal of an IMFS is to provide massive scalability to
-deal with the challenges of media storage growth, with guaranteed
-access and availability regardless of time and location. Finally, an
-IMFS gives applications the ability to access data securely, without
-the large fixed costs associated with acquiring and maintaining
-physical storage assets.
-
-Before you can get started with Zend_Service_Nirvanix, you must first
-register for an account (https://www.nirvanix.com/signUpSingle.aspx).
-After registering, you will receive a Username, Password, and
-Application Key. All three are required to use Zend_Service_Nirvanix.
-
 %package Zend_Service_Rackspace
 Summary:       Zend_Service_Rackspace
 Group:         Development/Languages/PHP
@@ -1140,6 +1281,11 @@ Summary: Zend_Service_ReCaptcha
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.recaptcha.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
+Suggests:      php(mcrypt)
+# Zend_Service_ReCaptcha_MailHide requires mcrypt
 
 %description Zend_Service_ReCaptcha
 Zend_Service_ReCaptcha provides a client for the reCAPTCHA Web
@@ -1172,26 +1318,15 @@ Zend_Service_ShortUrl provides an API for accessing a number of
 different URL shortener services, with the ability to both create
 short URLs as well as retrieve the original URL.
 
-%package Zend_Service_Simpy
-Summary:       Zend_Service_Simpy
-Group:         Development/Languages/PHP
-URL:           http://framework.zend.com/manual/1.12/en/zend.service.simpy.html
-Requires:      %{name} = %{version}-%{release}
-Requires:      php(dom)
-
-%description Zend_Service_Simpy
-Zend_Service_Simpy is a lightweight wrapper for the free REST API
-available for the Simpy social bookmarking service.
-
-In order to use Zend_Service_Simpy, you should already have a Simpy
-account. To get an account, visit the Simpy web site
-(http://simpy.com/).
-
 %package Zend_Service_SlideShare
 Summary:       Zend_Service_SlideShare
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.slideshare.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Cache = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 
 %description Zend_Service_SlideShare
 The Zend_Service_SlideShare component is used to interact with the
@@ -1208,6 +1343,7 @@ are needed in order to use the Zend_Service_SlideShare component.
 Summary:       Zend_Service_
 Group:         Development/Languages/PHP
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 
 %description Zend_Service_SqlAzure
 
@@ -1216,6 +1352,9 @@ Summary:  Zend_Service_StrikeIron
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.strikeiron.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
 
 %description Zend_Service_StrikeIron
 Zend_Service_StrikeIron provides a client to StrikeIron web services.
@@ -1246,6 +1385,12 @@ Summary: Zend_Service_Technorati
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.technorati.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Date = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 
 %description Zend_Service_Technorati
 Zend_Service_Technorati provides an easy, intuitive and
@@ -1261,8 +1406,14 @@ you first need to create a new Technorati account
 %package Zend_Service_Twitter
 Summary:       Zend_Service_Twitter
 Group:         Development/Languages/PHP
-URL:           http://framework.zend.com/manual/1.12/en/zend.service.technorati.html
+URL:           http://framework.zend.com/manual/1.12/en/zend.service.twitter.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Feed = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
+Requires:      %{name}-Zend_Rest = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
 
 %description Zend_Service_Twitter
 Zend_Service_Twitter provides a client for the Twitter REST API.
@@ -1276,6 +1427,7 @@ Summary:  Zend_Service_WindowsAzure
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.windowsazure.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 
 %description Zend_Service_WindowsAzure
 Windows Azure is the name for Microsoft’s Software + Services
@@ -1290,6 +1442,10 @@ Summary: Zend_Service_Yahoo
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.service.yahoo.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Rest = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(dom)
 
 %description Zend_Service_Yahoo
@@ -1305,6 +1461,8 @@ Summary:  Zend_Session
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.session.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      php(session)
 
 %description Zend_Session
 Zend_Session helps manage and preserve session data across multiple
@@ -1319,6 +1477,12 @@ Summary: Zend_Soap
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.soap.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Server = %{version}-%{release}
+Requires:      %{name}-Zend_Uri = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
+Requires:      php(dom)
+Requires:      php(simplexml)
 
 %description Zend_Soap
 Zend_Soap component is intended to simplify Web Services development
@@ -1342,6 +1506,7 @@ Summary:  Zend_Text
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.text.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
 
 %description Zend_Text
 Zend_Text is a component which enables developers to create a so
@@ -1354,6 +1519,12 @@ Summary: Zend_Test
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.test.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Controller = %{version}-%{release}
+Requires:      %{name}-Zend_Dom = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Layout = %{version}-%{release}
+Requires:      %{name}-Zend_Registry = %{version}-%{release}
+Requires:      %{name}-Zend_Session = %{version}-%{release}
 
 %description Zend_Test
 Zend_Test provides tools to facilitate unit testing of your Zend
@@ -1364,6 +1535,9 @@ Summary:  Zend_TimeSync
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.timesync.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Date = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
 
 %description Zend_TimeSync
 Zend_TimeSync is able to receive internet or network time from a time
@@ -1389,6 +1563,13 @@ Summary: Zend_Translate
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.translate.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
+Suggests:      php(xml)
+# Zend_Translate_Adapter_Qt requires xml
+# Zend_Translate_Adapter_Tmx requires xml
+# Zend_Translate_Adapter_Xliff requires xml
 
 %description Zend_Translate
 Zend_Translate is the Zend Framework's solution for multilingual
@@ -1418,6 +1599,10 @@ Summary: Zend_Uri
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.uri.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
+Requires:      %{name}-Zend_Validate = %{version}-%{release}
 Requires:      php(ctype)
 
 %description Zend_Uri
@@ -1431,7 +1616,11 @@ Summary: Zend_Validate
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.validate.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
 Requires:      php(ctype)
+Requires:      php(reflection)
 
 %description Zend_Validate
 The Zend_Validate component provides a set of commonly needed
@@ -1454,6 +1643,12 @@ Summary: Zend_View
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.view.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Controller = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
+Requires:      %{name}-Zend_Locale = %{version}-%{release}
+Requires:      %{name}-Zend_Registry = %{version}-%{release}
+Requires:      php(reflection)
 
 %description Zend_View
 Zend_View is a class for working with the "view" portion of the
@@ -1473,6 +1668,10 @@ Summary: Zend_Wildfire
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.wildfire.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Controller = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Json = %{version}-%{release}
+Requires:      %{name}-Zend_Loader = %{version}-%{release}
 
 %description Zend_Wildfire
 Zend_Wildfire is a component that facilitates communication between
@@ -1483,13 +1682,30 @@ architecture. At this time the primary focus is to provide a system to
 allow server-side PHP code to inject logging messages into the Firebug
 Console (http://getfirebug.com/).
 
+%package Zend_Xml
+Summary:       Zend_Xml
+Group:         Development/Languages/PHP
+Requires:      %{name} = %{version}-%{release}
+Requires:      php(dom)
+Requires:      php(simplexml)
+Requires:      php(xml)
+
+%description Zend_Xml
+Zend_Xml.
+
 %package Zend_XmlRpc
 Summary:       Zend_XmlRpc
 Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/1.12/en/zend.xmlrpc.html
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-Zend_Exception = %{version}-%{release}
+Requires:      %{name}-Zend_Http = %{version}-%{release}
+Requires:      %{name}-Zend_Server = %{version}-%{release}
+Requires:      %{name}-Zend_Xml = %{version}-%{release}
 Requires:      php(dom)
 Requires:      php(iconv)
+Requires:      php(reflection)
+Requires:      php(simplexml)
 
 %description Zend_XmlRpc
 From its home page <http://www.xmlrpc.com/>, XML-RPC is described as a
@@ -1547,8 +1763,7 @@ lint_php
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{php_pear_dir}/bin}
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_bindir},%{php_pear_dir}/bin}
 cp -a demos/Zend/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # library should be in include_path if used, so we use already defined %{php_pear_dir}
@@ -1728,13 +1943,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Http
 
-%if 0
-%files Zend_InfoCard
-%defattr(644,root,root,755)
-%{php_pear_dir}/Zend/InfoCard
-%{php_pear_dir}/Zend/InfoCard.php
-%endif
-
 %files Zend_Json
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Json
@@ -1919,9 +2127,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_pear_dir}/Zend/Service/Delicious
 %{php_pear_dir}/Zend/Service/Delicious.php
 
+%if 0
 %files Zend_Service_DeveloperGarden
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Service/DeveloperGarden
+%endif
 
 %files Zend_Service_Ebay
 %defattr(644,root,root,755)
@@ -1937,13 +2147,6 @@ rm -rf $RPM_BUILD_ROOT
 %{php_pear_dir}/Zend/Service/LiveDocx
 %{php_pear_dir}/Zend/Service/LiveDocx.php
 
-%if 0
-%files Zend_Service_Nirvanix
-%defattr(644,root,root,755)
-%{php_pear_dir}/Zend/Service/Nirvanix
-%{php_pear_dir}/Zend/Service/Nirvanix.php
-%endif
-
 %files Zend_Service_Rackspace
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Service/Rackspace
@@ -1957,13 +2160,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Service/ShortUrl
 
-%if 0
-%files Zend_Service_Simpy
-%defattr(644,root,root,755)
-%{php_pear_dir}/Zend/Service/Simpy
-%{php_pear_dir}/Zend/Service/Simpy.php
-%endif
-
 %files Zend_Service_SlideShare
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Service/SlideShare
@@ -1978,10 +2174,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_pear_dir}/Zend/Service/StrikeIron
 %{php_pear_dir}/Zend/Service/StrikeIron.php
 
+%if 0
 %files Zend_Service_Technorati
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Service/Technorati
 %{php_pear_dir}/Zend/Service/Technorati.php
+%endif
 
 %files Zend_Service_Twitter
 %defattr(644,root,root,755)
@@ -2057,14 +2255,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/Wildfire
 
+%files Zend_Xml
+%defattr(644,root,root,755)
+%{php_pear_dir}/Zend/Xml
+
 %files Zend_XmlRpc
 %defattr(644,root,root,755)
 %{php_pear_dir}/Zend/XmlRpc
 
-%dir %{php_pear_dir}/Zend/Xml
-%{php_pear_dir}/Zend/Xml/Exception.php
-%{php_pear_dir}/Zend/Xml/Security.php
-
 %files demos
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}