simplify doc install

[packages/php-ZendFramework.git] / php-ZendFramework.spec

diff --git a/php-ZendFramework.spec b/php-ZendFramework.spec
index f8c75b6d66739a5f61965e2832fe4c539ece98d7..cdfeff63ccb81d7d6689881dc211349958c90c78 100644 (file)
--- a/php-ZendFramework.spec
+++ b/php-ZendFramework.spec
@@ -8,17 +8,18 @@
 
 Summary:       Zend Framework 2
 Name:          php-ZendFramework
-Version:       2.4.8
-Release:       0.4
+Version:       2.4.9
+Release:       2
 License:       BSD
-Group:         Development/Libraries
+Group:         Development/Languages/PHP
 Source0:       https://packages.zendframework.com/releases/ZendFramework-%{version}/ZendFramework-%{version}.tgz
-# Source0-md5: 145d2e23b9f745a1e11adbecc98761e9
+# Source0-md5: 6228d1fdcd9053315e85d1ce45811bf4
 # git clone https://github.com/zendframework/zf2.git
 # cd zf2; git checkout release-2.4.8
 # tar czf ../ZendFramework-tests-2.4.8.tgz tests
 #Source1:      ZendFramework-tests-%{version}.tgz
 Source2:       autoload.php
+Patch0:                bug-64.patch
 URL:           http://framework.zend.com/
 Requires:      php(core) >= 5.3.23
 %if %{with tests}
@@ -38,9 +39,22 @@ framework with over 15 million downloads.
 
 %package Authentication
 Summary:       Zend Framework 2: Authentication Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.authentication.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Suggests:      %{name}-Crypt = %{version}-%{release}
+Suggests:      %{name}-Db = %{version}-%{release}
+Suggests:      %{name}-Http = %{version}-%{release}
+Suggests:      %{name}-Ldap = %{version}-%{release}
+Suggests:      %{name}-Session = %{version}-%{release}
+Suggests:      %{name}-Uri = %{version}-%{release}
+Suggests:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(date)
+Suggests:      php(hash)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Authentication
 The Zend\Authentication component provides an API for authentication
@@ -59,11 +73,17 @@ Zend\Permissions\Acl or Zend\Permissions\Rbac component.
 
 %package Barcode
 Summary:       Zend Framework 2: Barcode Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.barcode.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Validator = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(dom)
+Suggests:      php(gd)
+Suggests:      php(iconv)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Barcode
 Zend\Barcode\Barcode provides a generic way to generate barcodes. The
@@ -74,6 +94,7 @@ based on the support required.
 
 %package Cache
 Summary:       Zend Framework 2: Cache Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-cache
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-EventManager = %{version}-%{release}
@@ -81,6 +102,10 @@ Requires:   %{name}-Serializer = %{version}-%{release}
 Requires:      %{name}-ServiceManager = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-Session = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Cache
 %{summary}
@@ -96,6 +121,7 @@ Optional:
 
 %package Captcha
 Summary:       Zend Framework 2: CAPTCHA Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.captcha.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Math = %{version}-%{release}
@@ -103,6 +129,9 @@ Requires:   %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-Session = %{version}-%{release}
 Suggests:      %{name}-Text = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(gd)
+Suggests:      php(spl)
 
 %description Captcha
 CAPTCHA stands for "Completely Automated Public Turing test to tell
@@ -120,10 +149,15 @@ conjunction with the Zend\Form component.
 
 %package Code
 Summary:       Zend Framework 2: Code Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-EventManager = %{version}-%{release}
 Suggests:      %{name}-Stdlib = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
+Suggests:      php(tokenizer)
 
 %description Code
 Provides facilities to generate arbitrary code using an object
@@ -131,6 +165,7 @@ oriented interface.
 
 %package Config
 Summary:       Zend Framework 2: Config Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.config.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
@@ -138,6 +173,11 @@ Suggests:  %{name}-Filter = %{version}-%{release}
 Suggests:      %{name}-I18n = %{version}-%{release}
 Suggests:      %{name}-Json = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(spl)
+Suggests:      php(xml)
+Suggests:      php(xmlreader)
+Suggests:      php(xmlwriter)
 
 %description Config
 Zend\Config is designed to simplify access to configuration data
@@ -150,11 +190,16 @@ YAML and XML files.
 
 %package Console
 Summary:       Zend Framework 2: Console Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.console.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Filter = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
+Suggests:      php(xml)
 
 %description Console
 Zend Framework 2 features built-in console support.
@@ -180,11 +225,17 @@ controller to handle the request.
 
 %package Crypt
 Summary:       Zend Framework 2: Crypt Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.crypt.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Math = %{version}-%{release}
 Requires:      %{name}-ServiceManager = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Suggests:      php(hash)
+Suggests:      php(mcrypt)
+Suggests:      php(openssl)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Crypt
 Zend\Crypt provides support of some cryptographic tools. The available
@@ -209,11 +260,16 @@ component only if you have a minimum background on this topic.
 
 %package Db
 Summary:       Zend Framework 2: DB Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-db
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-EventManager = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(pcre)
+Suggests:      php(pdo)
+Suggests:      php(spl)
 
 %description Db
 %{summary}
@@ -227,9 +283,11 @@ Optional:
 
 %package Debug
 Summary:       Zend Framework 2: Debug Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html
 Requires:      %{name} = %{version}-%{release}
 Suggests:      %{name}-Escaper = %{version}-%{release}
+Suggests:      php(pcre)
 
 %description Debug
 %{summary}
@@ -238,11 +296,15 @@ Optional: XDebug (php-pecl-xdebug)
 
 %package Di
 Summary:       Zend Framework 2: DI Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.di.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Code = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Di
 Dependency Injection (here-in called DI) is a concept that has been
@@ -256,8 +318,13 @@ injected into MovieLister.
 
 %package Dom
 Summary:       Zend Framework 2: DOM Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.dom.intro.html
 Requires:      %{name} = %{version}-%{release}
+Suggests:      php(dom)
+Suggests:      php(pcre)
+Suggests:      php(spl)
+Suggests:      php(xml)
 
 %description Dom
 The Zend\Dom component provides tools for working with DOM documents
@@ -267,8 +334,14 @@ CSS selectors.
 
 %package Escaper
 Summary:       Zend Framework 2: Escaper Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.escaper.introduction.html
 Requires:      %{name} = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(iconv)
+Suggests:      php(mbstring)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Escaper
 The OWASP Top 10 web security risks study lists Cross-Site Scripting
@@ -280,9 +353,11 @@ introducing contextual escaping based on peer-reviewed rules.
 
 %package EventManager
 Summary:       Zend Framework 2: EventManager Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.event-manager.event-manager.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Suggests:      php(spl)
 
 %description EventManager
 The EventManager is a component designed for the following use cases:
@@ -297,6 +372,7 @@ collections; trigger events; and interrupt execution of listeners.
 
 %package Feed
 Summary:       Zend Framework 2: Feed Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.feed.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Escaper = %{version}-%{release}
@@ -306,6 +382,14 @@ Suggests:  %{name}-Db = %{version}-%{release}
 Suggests:      %{name}-Http = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(date)
+Suggests:      php(dom)
+Suggests:      php(hash)
+Suggests:      php(pcre)
+Suggests:      php(spl)
+Suggests:      php(tidy)
+Suggests:      php(xml)
 
 %description Feed
 Zend\Feed provides functionality for consuming RSS and Atom feeds. It
@@ -324,18 +408,25 @@ but used in conjunction with RSS and Atom feeds.
 
 %package File
 Summary:       Zend Framework 2: File Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-file
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-Filter = %{version}-%{release}
 Suggests:      %{name}-I18n = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(fileinfo)
+Suggests:      php(hash)
+Suggests:      php(pcre)
+Suggests:      php(spl)
+Suggests:      php(tokenizer)
 
 %description File
 %{summary}
 
 %package Filter
 Summary:       Zend Framework 2: Filter Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.filter.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
@@ -343,6 +434,16 @@ Suggests:  %{name}-Crypt = %{version}-%{release}
 Suggests:      %{name}-I18n = %{version}-%{release}
 Suggests:      %{name}-Servicemanager = %{version}-%{release}
 Suggests:      %{name}-Uri = %{version}-%{release}
+Suggests:      php(bz2)
+Suggests:      php(date)
+Suggests:      php(iconv)
+Suggests:      php(lzf)
+Suggests:      php(mbstring)
+Suggests:      php(openssl)
+Suggests:      php(pcre)
+Suggests:      php(spl)
+Suggests:      php(zip)
+Suggests:      php(zlib)
 
 %description Filter
 The Zend\Filter component provides a set of commonly needed data
@@ -352,6 +453,7 @@ order.
 
 %package Form
 Summary:       Zend Framework 2: Form Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.form.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-InputFilter = %{version}-%{release}
@@ -364,6 +466,11 @@ Suggests:  %{name}-I18n = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
 Suggests:      %{name}-View = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(intl)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Form
 Zend\Form is intended primarily as a bridge between your domain models
@@ -382,12 +489,21 @@ The Zend\Form component consists of the following objects:
 
 %package Http
 Summary:       Zend Framework 2: HTTP Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.http.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Loader = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Uri = %{version}-%{release}
 Requires:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(curl)
+Suggests:      php(date)
+Suggests:      php(fileinfo)
+Suggests:      php(openssl)
+Suggests:      php(pcre)
+Suggests:      php(spl)
+Suggests:      php(zlib)
 
 %description Http
 Zend\Http is a primary foundational component of Zend Framework. Since
@@ -406,9 +522,11 @@ things HTTP. In nutshell, there are several parts of Zend\Http:
 
 %package I18n
 Summary:       Zend Framework 2: i18n Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.i18n.translating.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Requires:      php(intl)
 Suggests:      %{name}-Cache = %{version}-%{release}
 Suggests:      %{name}-Config = %{version}-%{release}
 Suggests:      %{name}-EventManager = %{version}-%{release}
@@ -416,6 +534,10 @@ Suggests:  %{name}-Filter = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
 Suggests:      %{name}-View = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(date)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description I18n
 ZendI18n comes with a complete translation suite which supports all
@@ -430,12 +552,14 @@ will actually do nothing but just return the given message IDs.
 
 %package InputFilter
 Summary:       Zend Framework 2: InputFilter Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.input-filter.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Filter = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Validator = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(spl)
 
 %description InputFilter
 The Zend\InputFilter component can be used to filter and validate
@@ -444,12 +568,18 @@ $_GET or $_POST values, CLI arguments, etc.
 
 %package Json
 Summary:       Zend Framework 2: JSON Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.json.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-Http = %{version}-%{release}
 Suggests:      %{name}-Server = %{version}-%{release}
 Suggests:      %{name}-Zendxml = %{version}-%{release}
+Suggests:      php(json)
+Suggests:      php(mbstring)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Json
 Zend\Json provides convenience methods for serializing native PHP to
@@ -472,10 +602,18 @@ processing techniques.
 
 %package Ldap
 Summary:       Zend Framework 2: LDAP Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.ldap.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Requires:      php(ldap)
 Suggests:      %{name}-EventManager = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(iconv)
+Suggests:      php(json)
+Suggests:      php(mbstring)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Ldap
 Zend\Ldap\Ldap is a class for performing LDAP operations including but
@@ -484,14 +622,20 @@ directory.
 
 %package Loader
 Summary:       Zend Framework 2: Loader Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-loader
 Requires:      %{name} = %{version}-%{release}
+Suggests:      php(bz2)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Loader
 %{summary}
 
 %package Log
 Summary:       Zend Framework 2: Log Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.log.overview.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-ServiceManager = %{version}-%{release}
@@ -501,6 +645,11 @@ Suggests:  %{name}-Db = %{version}-%{release}
 Suggests:      %{name}-Escaper = %{version}-%{release}
 Suggests:      %{name}-Mail = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(dom)
+Suggests:      php(json)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Log
 Zend\Log\Logger is a component for general purpose logging. It
@@ -525,6 +674,7 @@ Optional: MongoDB (php-pecl-mongo)
 
 %package Mail
 Summary:       Zend Framework 2: Mail Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.mail.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Crypt = %{version}-%{release}
@@ -533,6 +683,11 @@ Requires:  %{name}-Mime = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Validator = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(date)
+Suggests:      php(iconv)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Mail
 Zend\Mail provides generalized functionality to compose and send both
@@ -544,9 +699,15 @@ Mail\Transport\TransportInterface.
 
 %package Math
 Summary:       Zend Framework 2: Math Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.math.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(bcmath)
+Suggests:      php(mcrypt)
+Suggests:      php(openssl)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Math
 Zend\Math namespace provides general mathematical functions. So far
@@ -559,19 +720,25 @@ Optional: php-gmp
 
 %package Memory
 Summary:       Zend Framework 2: Memory Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html
 Requires:      %{name} = %{version}-%{release}
 Suggests:      %{name}-Cache = %{version}-%{release}
+Suggests:      php(spl)
 
 %description Memory
 %{summary}
 
 %package Mime
 Summary:       Zend Framework 2: MIME Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.mime.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-Mail = %{version}-%{release}
+Suggests:      php(iconv)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Mime
 Zend\Mime\Mime is a support class for handling multipart MIME
@@ -582,6 +749,7 @@ Optional: %{name}-Mail
 
 %package ModuleManager
 Summary:       Zend Framework 2: ModuleManager Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.module-manager.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-EventManager = %{version}-%{release}
@@ -590,6 +758,7 @@ Suggests:   %{name}-Config = %{version}-%{release}
 Suggests:      %{name}-Console = %{version}-%{release}
 Suggests:      %{name}-Loader = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(spl)
 
 %description ModuleManager
 Zend Framework 2.0 introduces a new and powerful approach to modules.
@@ -600,6 +769,7 @@ public assets such as images, CSS, and JavaScript.
 
 %package Mvc
 Summary:       Zend Framework 2: MVC Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.mvc.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-EventManager = %{version}-%{release}
@@ -624,6 +794,10 @@ Suggests:  %{name}-Uri = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
 Suggests:      %{name}-Version = %{version}-%{release}
 Suggests:      %{name}-View = %{version}-%{release}
+Suggests:      php(intl)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Mvc
 Zend\Mvc is a brand new MVC implementation designed from the ground up
@@ -644,6 +818,7 @@ The MVC layer is built on top of the following components:
 
 %package Navigation
 Summary:       Zend Framework 2: Navigation Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.navigation.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
@@ -652,6 +827,8 @@ Suggests:   %{name}-Mvc = %{version}-%{release}
 Suggests:      %{name}-Permissions-Acl = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-View = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Navigation
 Zend\Navigation is a component for managing trees of pointers to web
@@ -661,15 +838,18 @@ purposes.
 
 %package Paginator
 Summary:       Zend Framework 2: Paginator Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.paginator.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
-Suggests:      %{name}-cache = %{version}-%{release}
-Suggests:      %{name}-db = %{version}-%{release}
-Suggests:      %{name}-filter = %{version}-%{release}
-Suggests:      %{name}-json = %{version}-%{release}
-Suggests:      %{name}-servicemanager = %{version}-%{release}
-Suggests:      %{name}-view = %{version}-%{release}
+Suggests:      %{name}-Cache = %{version}-%{release}
+Suggests:      %{name}-Db = %{version}-%{release}
+Suggests:      %{name}-Filter = %{version}-%{release}
+Suggests:      %{name}-Json = %{version}-%{release}
+Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      %{name}-View = %{version}-%{release}
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Paginator
 Zend\Paginator is a flexible component for paginating collections of
@@ -687,9 +867,11 @@ The primary design goals of Zend\Paginator are as follows:
 
 %package Permissions-Acl
 Summary:       Zend Framework 2: Permissions ACL Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.permissions.acl.intro.html
 Requires:      %{name} = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(spl)
 
 %description Permissions-Acl
 The Zend\Permissions\Acl component provides a lightweight and flexible
@@ -712,8 +894,10 @@ control how roles are granted access to resources.
 
 %package Permissions-Rbac
 Summary:       Zend Framework 2: Permissions RBAC Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.permissions.rbac.intro.html
 Requires:      %{name} = %{version}-%{release}
+Suggests:      php(spl)
 
 %description Permissions-Rbac
 The Zend\Permissions\Rbac component provides a lightweight role-based
@@ -724,11 +908,16 @@ permissions rather than objects (resources).
 
 %package ProgressBar
 Summary:       Zend Framework 2: ProgressBar Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.progress-bar.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-Json = %{version}-%{release}
 Suggests:      %{name}-Session = %{version}-%{release}
+Suggests:      php(apc)
+Suggests:      php(date)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description ProgressBar
 Zend\ProgressBar is a component to create and update progress bars in
@@ -740,12 +929,19 @@ estimated time left.
 
 %package Serializer
 Summary:       Zend Framework 2: Serializer Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.serializer.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Json = %{version}-%{release}
 Requires:      %{name}-Math = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(dom)
+Suggests:      php(igbinary)
+Suggests:      php(pcre)
+Suggests:      php(simplexml)
+Suggests:      php(spl)
+Suggests:      php(xml)
 
 %description Serializer
 The Zend\Serializer component provides an adapter based interface to
@@ -756,10 +952,14 @@ Optional: msgpack (php-pecl-msgpack)
 
 %package Server
 Summary:       Zend Framework 2: Server Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.server.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Code = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Server
 The Zend\Server family of classes provides functionality for the
@@ -775,9 +975,12 @@ Zend\Server\Server's getFunctions() and loadFunctions() methods.
 
 %package ServiceManager
 Summary:       Zend Framework 2: ServiceManager Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.service-manager.intro.html
 Requires:      %{name} = %{version}-%{release}
 Suggests:      %{name}-Di = %{version}-%{release}
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description ServiceManager
 The Service Locator design pattern is implemented by the
@@ -786,6 +989,7 @@ locator, tasked with retrieving other objects.
 
 %package Session
 Summary:       Zend Framework 2: Session Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-session
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-EventManager = %{version}-%{release}
@@ -795,6 +999,11 @@ Suggests:  %{name}-Db = %{version}-%{release}
 Suggests:      %{name}-Http = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(hash)
+Suggests:      php(pcre)
+Suggests:      php(session)
+Suggests:      php(spl)
 
 %description Session
 Manage and preserve session data, a logical complement of cookie data,
@@ -804,35 +1013,56 @@ Optional: MongoDB (php-pecl-mongo)
 
 %package Soap
 Summary:       Zend Framework 2: SOAP Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-soap
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Server = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Uri = %{version}-%{release}
+Requires:      php(soap)
 Suggests:      %{name}-Http = %{version}-%{release}
+Suggests:      php(curl)
+Suggests:      php(dom)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(simplexml)
+Suggests:      php(spl)
+Suggests:      php(xml)
 
 %description Soap
 %{summary}
 
 %package Stdlib
 Summary:       Zend Framework 2: Stdlib Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-stdlib
 Requires:      %{name} = %{version}-%{release}
 Suggests:      %{name}-EventManager = %{version}-%{release}
 Suggests:      %{name}-Filter = %{version}-%{release}
 Suggests:      %{name}-Serializer = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(iconv)
+Suggests:      php(intl)
+Suggests:      php(json)
+Suggests:      php(mbstring)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(spl)
 
 %description Stdlib
 %{summary}
 
 %package Tag
 Summary:       Zend Framework 2: Tag Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.tag.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Escaper = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Tag
 Zend\Tag is a component suite which provides a facility to work with
@@ -853,6 +1083,7 @@ weight values based on the given relative weights of each item in it.
 
 %package Test
 Summary:       Zend Framework 2: Test Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.test.introduction.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Console = %{version}-%{release}
@@ -864,6 +1095,8 @@ Requires:  %{name}-ServiceManager = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-Uri = %{version}-%{release}
 Requires:      %{name}-View = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Test
 The Zend\Test component provides tools to facilitate unit testing of
@@ -874,10 +1107,14 @@ PHPUnit is the only library supported currently.
 
 %package Text
 Summary:       Zend Framework 2: Text Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/index.html#zend-text
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-ServiceManager = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 ### TODO: Is Zend/Text/Figlet/zend-framework.flf allowed?
 
@@ -886,10 +1123,13 @@ Requires:        %{name}-Stdlib = %{version}-%{release}
 
 %package Uri
 Summary:       Zend Framework 2: URI Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.uri.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Escaper = %{version}-%{release}
 Requires:      %{name}-Validator = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Uri
 Zend\Uri is a component that aids in manipulating and validating
@@ -907,6 +1147,7 @@ if such a class is registered with the Factory.
 
 %package Validator
 Summary:       Zend Framework 2: Validator Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.validator.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
@@ -917,6 +1158,12 @@ Suggests: %{name}-Math = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-Session = %{version}-%{release}
 Suggests:      %{name}-Uri = %{version}-%{release}
+Suggests:      php(ctype)
+Suggests:      php(date)
+Suggests:      php(fileinfo)
+Suggests:      php(hash)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Validator
 The Zend\Validator component provides a set of commonly needed
@@ -926,10 +1173,13 @@ user-defined order.
 
 %package Version
 Summary:       Zend Framework 2: Version Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.version.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Json = %{version}-%{release}
 Suggests:      %{name}-Http = %{version}-%{release}
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description Version
 Zend\Version provides a class constant Zend\Version\Version::VERSION
@@ -945,6 +1195,7 @@ newer than the version of the Zend Framework installation.
 
 %package View
 Summary:       Zend Framework 2: View Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.view.quick-start.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-EventManager = %{version}-%{release}
@@ -963,6 +1214,11 @@ Suggests: %{name}-Paginator = %{version}-%{release}
 Suggests:      %{name}-Permissions-Acl = %{version}-%{release}
 Suggests:      %{name}-ServiceManager = %{version}-%{release}
 Suggests:      %{name}-Uri = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(dom)
+Suggests:      php(filter)
+Suggests:      php(pcre)
+Suggests:      php(spl)
 
 %description View
 Zend\View provides the "View' layer of Zend Framework 2's MVC system.
@@ -971,6 +1227,7 @@ extension, substitution, and more.
 
 %package XmlRpc
 Summary:       Zend Framework 2: XML-RPC Component
+Group:         Development/Languages/PHP
 URL:           http://framework.zend.com/manual/2.4/en/modules/zend.xmlrpc.intro.html
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-Http = %{version}-%{release}
@@ -979,6 +1236,15 @@ Requires: %{name}-Server = %{version}-%{release}
 Requires:      %{name}-Stdlib = %{version}-%{release}
 Requires:      %{name}-ZendXml = %{version}-%{release}
 Suggests:      %{name}-Cache = %{version}-%{release}
+Suggests:      php(date)
+Suggests:      php(dom)
+Suggests:      php(iconv)
+Suggests:      php(pcre)
+Suggests:      php(reflection)
+Suggests:      php(simplexml)
+Suggests:      php(spl)
+Suggests:      php(xml)
+Suggests:      php(xmlwriter)
 
 %description XmlRpc
 From its home page, XML-RPC is described as a '...remote procedure
@@ -993,8 +1259,13 @@ services and building new XML-RPC servers.
 
 %package ZendXml
 Summary:       Zend Framework 2: XML usage, best practices, and security in PHP
+Group:         Development/Languages/PHP
 URL:           https://github.com/zendframework/ZendXml
 Requires:      %{name} = %{version}-%{release}
+Requires:      php(dom)
+Requires:      php(simplexml)
+Requires:      php(spl)
+Requires:      php(xml)
 
 %description ZendXml
 This is a security component to prevent XML eXternal Entity (XXE) and
@@ -1009,6 +1280,16 @@ usage. If the XML document uses ENTITY the library throw an Exception.
 
 %prep
 %setup -q -n ZendFramework-%{version} %{?with_tests:-a 1}
+%patch -p2 -d library/Zend/Mail
+
+# move doc for easier install
+install -d doc
+for p in library/Zend/*/*.json library/Zend/*/*/*.json; do
+       p=${p%/composer.json}
+       d=${p#library/Zend/}
+       install -d doc/$d
+       mv $p/*.md $p/composer.json doc/$d
+done
 
 %build
 %if %{with tests}
@@ -1055,406 +1336,306 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{php_data_dir}/Zend/autoload.php
 
 %files Authentication
 %defattr(644,root,root,755)
-%doc library/Zend/Authentication/*.md
-%doc library/Zend/Authentication/composer.json
+%doc doc/Authentication/*.md
+%doc doc/Authentication/composer.json
 %{php_data_dir}/Zend/Authentication
-%exclude %{php_data_dir}/Zend/Authentication/*.md
-%exclude %{php_data_dir}/Zend/Authentication/composer.json
 
 %files Barcode
 %defattr(644,root,root,755)
-%doc library/Zend/Barcode/*.md
-%doc library/Zend/Barcode/composer.json
+%doc doc/Barcode/*.md
+%doc doc/Barcode/composer.json
 %{php_data_dir}/Zend/Barcode
-%exclude %{php_data_dir}/Zend/Barcode/*.md
-%exclude %{php_data_dir}/Zend/Barcode/composer.json
 
 %files Cache
 %defattr(644,root,root,755)
-%doc library/Zend/Cache/*.md
-%doc library/Zend/Cache/composer.json
+%doc doc/Cache/*.md
+%doc doc/Cache/composer.json
 %{php_data_dir}/Zend/Cache
-%exclude %{php_data_dir}/Zend/Cache/*.md
-%exclude %{php_data_dir}/Zend/Cache/composer.json
 
 %files Captcha
 %defattr(644,root,root,755)
-%doc library/Zend/Captcha/*.md
-%doc library/Zend/Captcha/composer.json
+%doc doc/Captcha/*.md
+%doc doc/Captcha/composer.json
 %{php_data_dir}/Zend/Captcha
-%exclude %{php_data_dir}/Zend/Captcha/*.md
-%exclude %{php_data_dir}/Zend/Captcha/composer.json
 
 %files Code
 %defattr(644,root,root,755)
-%doc library/Zend/Code/*.md
-%doc library/Zend/Code/composer.json
+%doc doc/Code/*.md
+%doc doc/Code/composer.json
 %{php_data_dir}/Zend/Code
-%exclude %{php_data_dir}/Zend/Code/*.md
-%exclude %{php_data_dir}/Zend/Code/composer.json
 
 %files Config
 %defattr(644,root,root,755)
-%doc library/Zend/Config/*.md
-%doc library/Zend/Config/composer.json
+%doc doc/Config/*.md
+%doc doc/Config/composer.json
 %{php_data_dir}/Zend/Config
-%exclude %{php_data_dir}/Zend/Config/*.md
-%exclude %{php_data_dir}/Zend/Config/composer.json
 
 %files Console
 %defattr(644,root,root,755)
-%doc library/Zend/Console/*.md
-%doc library/Zend/Console/composer.json
+%doc doc/Console/*.md
+%doc doc/Console/composer.json
 %{php_data_dir}/Zend/Console
-%exclude %{php_data_dir}/Zend/Console/*.md
-%exclude %{php_data_dir}/Zend/Console/composer.json
 
 %files Crypt
 %defattr(644,root,root,755)
-%doc library/Zend/Crypt/*.md
-%doc library/Zend/Crypt/composer.json
+%doc doc/Crypt/*.md
+%doc doc/Crypt/composer.json
 %{php_data_dir}/Zend/Crypt
-%exclude %{php_data_dir}/Zend/Crypt/*.md
-%exclude %{php_data_dir}/Zend/Crypt/composer.json
 
 %files Db
 %defattr(644,root,root,755)
-%doc library/Zend/Db/*.md
-%doc library/Zend/Db/composer.json
+%doc doc/Db/*.md
+%doc doc/Db/composer.json
 %{php_data_dir}/Zend/Db
-%exclude %{php_data_dir}/Zend/Db/*.md
-%exclude %{php_data_dir}/Zend/Db/composer.json
 
 %files Debug
 %defattr(644,root,root,755)
-%doc library/Zend/Debug/*.md
-%doc library/Zend/Debug/composer.json
+%doc doc/Debug/*.md
+%doc doc/Debug/composer.json
 %{php_data_dir}/Zend/Debug
-%exclude %{php_data_dir}/Zend/Debug/*.md
-%exclude %{php_data_dir}/Zend/Debug/composer.json
 
 %files Di
 %defattr(644,root,root,755)
-%doc library/Zend/Di/*.md
-%doc library/Zend/Di/composer.json
+%doc doc/Di/*.md
+%doc doc/Di/composer.json
 %{php_data_dir}/Zend/Di
-%exclude %{php_data_dir}/Zend/Di/*.md
-%exclude %{php_data_dir}/Zend/Di/composer.json
 
 %files Dom
 %defattr(644,root,root,755)
-%doc library/Zend/Dom/*.md
-%doc library/Zend/Dom/composer.json
+%doc doc/Dom/*.md
+%doc doc/Dom/composer.json
 %{php_data_dir}/Zend/Dom
-%exclude %{php_data_dir}/Zend/Dom/*.md
-%exclude %{php_data_dir}/Zend/Dom/composer.json
 
 %files Escaper
 %defattr(644,root,root,755)
-%doc library/Zend/Escaper/*.md
-%doc library/Zend/Escaper/composer.json
+%doc doc/Escaper/*.md
+%doc doc/Escaper/composer.json
 %{php_data_dir}/Zend/Escaper
-%exclude %{php_data_dir}/Zend/Escaper/*.md
-%exclude %{php_data_dir}/Zend/Escaper/composer.json
 
 %files EventManager
 %defattr(644,root,root,755)
-%doc library/Zend/EventManager/*.md
-%doc library/Zend/EventManager/composer.json
+%doc doc/EventManager/*.md
+%doc doc/EventManager/composer.json
 %{php_data_dir}/Zend/EventManager
-%exclude %{php_data_dir}/Zend/EventManager/*.md
-%exclude %{php_data_dir}/Zend/EventManager/composer.json
 
 %files Feed
 %defattr(644,root,root,755)
-%doc library/Zend/Feed/*.md
-%doc library/Zend/Feed/composer.json
+%doc doc/Feed/*.md
+%doc doc/Feed/composer.json
 %{php_data_dir}/Zend/Feed
-%exclude %{php_data_dir}/Zend/Feed/*.md
-%exclude %{php_data_dir}/Zend/Feed/composer.json
 
 %files File
 %defattr(644,root,root,755)
-%doc library/Zend/File/*.md
-%doc library/Zend/File/composer.json
+%doc doc/File/*.md
+%doc doc/File/composer.json
 %{php_data_dir}/Zend/File
-%exclude %{php_data_dir}/Zend/File/*.md
-%exclude %{php_data_dir}/Zend/File/composer.json
 
 %files Filter
 %defattr(644,root,root,755)
-%doc library/Zend/Filter/*.md
-%doc library/Zend/Filter/composer.json
+%doc doc/Filter/*.md
+%doc doc/Filter/composer.json
 %{php_data_dir}/Zend/Filter
-%exclude %{php_data_dir}/Zend/Filter/*.md
-%exclude %{php_data_dir}/Zend/Filter/composer.json
 
 %files Form
 %defattr(644,root,root,755)
-%doc library/Zend/Form/*.md
-%doc library/Zend/Form/composer.json
+%doc doc/Form/*.md
+%doc doc/Form/composer.json
 %{php_data_dir}/Zend/Form
-%exclude %{php_data_dir}/Zend/Form/*.md
-%exclude %{php_data_dir}/Zend/Form/composer.json
 
 %files Http
 %defattr(644,root,root,755)
-%doc library/Zend/Http/*.md
-%doc library/Zend/Http/composer.json
+%doc doc/Http/*.md
+%doc doc/Http/composer.json
 %{php_data_dir}/Zend/Http
-%exclude %{php_data_dir}/Zend/Http/*.md
-%exclude %{php_data_dir}/Zend/Http/composer.json
 
 %files I18n
 %defattr(644,root,root,755)
-%doc library/Zend/I18n/*.md
-%doc library/Zend/I18n/composer.json
+%doc doc/I18n/*.md
+%doc doc/I18n/composer.json
 %{php_data_dir}/Zend/I18n
-%exclude %{php_data_dir}/Zend/I18n/*.md
-%exclude %{php_data_dir}/Zend/I18n/composer.json
 
 %files InputFilter
 %defattr(644,root,root,755)
-%doc library/Zend/InputFilter/*.md
-%doc library/Zend/InputFilter/composer.json
+%doc doc/InputFilter/*.md
+%doc doc/InputFilter/composer.json
 %{php_data_dir}/Zend/InputFilter
-%exclude %{php_data_dir}/Zend/InputFilter/*.md
-%exclude %{php_data_dir}/Zend/InputFilter/composer.json
 
 %files Json
 %defattr(644,root,root,755)
-%doc library/Zend/Json/*.md
-%doc library/Zend/Json/composer.json
+%doc doc/Json/*.md
+%doc doc/Json/composer.json
 %{php_data_dir}/Zend/Json
-%exclude %{php_data_dir}/Zend/Json/*.md
-%exclude %{php_data_dir}/Zend/Json/composer.json
 
 %files Ldap
 %defattr(644,root,root,755)
-%doc library/Zend/Ldap/*.md
-%doc library/Zend/Ldap/composer.json
+%doc doc/Ldap/*.md
+%doc doc/Ldap/composer.json
 %{php_data_dir}/Zend/Ldap
-%exclude %{php_data_dir}/Zend/Ldap/*.md
-%exclude %{php_data_dir}/Zend/Ldap/composer.json
 
 %files Loader
 %defattr(644,root,root,755)
-%doc library/Zend/Loader/*.md
-%doc library/Zend/Loader/composer.json
+%doc doc/Loader/*.md
+%doc doc/Loader/composer.json
 %{php_data_dir}/Zend/autoload.php
 %{php_data_dir}/Zend/Loader
-%exclude %{php_data_dir}/Zend/Loader/*.md
-%exclude %{php_data_dir}/Zend/Loader/composer.json
 
 %files Log
 %defattr(644,root,root,755)
-%doc library/Zend/Log/*.md
-%doc library/Zend/Log/composer.json
+%doc doc/Log/*.md
+%doc doc/Log/composer.json
 %{php_data_dir}/Zend/Log
-%exclude %{php_data_dir}/Zend/Log/*.md
-%exclude %{php_data_dir}/Zend/Log/composer.json
 
 %files Mail
 %defattr(644,root,root,755)
-%doc library/Zend/Mail/*.md
-%doc library/Zend/Mail/composer.json
+%doc doc/Mail/*.md
+%doc doc/Mail/composer.json
 %{php_data_dir}/Zend/Mail
-%exclude %{php_data_dir}/Zend/Mail/*.md
-%exclude %{php_data_dir}/Zend/Mail/composer.json
 
 %files Math
 %defattr(644,root,root,755)
-%doc library/Zend/Math/*.md
-%doc library/Zend/Math/composer.json
+%doc doc/Math/*.md
+%doc doc/Math/composer.json
 %{php_data_dir}/Zend/Math
-%exclude %{php_data_dir}/Zend/Math/*.md
-%exclude %{php_data_dir}/Zend/Math/composer.json
 
 %files Memory
 %defattr(644,root,root,755)
-%doc library/Zend/Memory/*.md
-%doc library/Zend/Memory/composer.json
+%doc doc/Memory/*.md
+%doc doc/Memory/composer.json
 %{php_data_dir}/Zend/Memory
-%exclude %{php_data_dir}/Zend/Memory/*.md
-%exclude %{php_data_dir}/Zend/Memory/composer.json
 
 %files Mime
 %defattr(644,root,root,755)
-%doc library/Zend/Mime/*.md
-%doc library/Zend/Mime/composer.json
+%doc doc/Mime/*.md
+%doc doc/Mime/composer.json
 %{php_data_dir}/Zend/Mime
-%exclude %{php_data_dir}/Zend/Mime/*.md
-%exclude %{php_data_dir}/Zend/Mime/composer.json
 
 %files ModuleManager
 %defattr(644,root,root,755)
-%doc library/Zend/ModuleManager/*.md
-%doc library/Zend/ModuleManager/composer.json
+%doc doc/ModuleManager/*.md
+%doc doc/ModuleManager/composer.json
 %{php_data_dir}/Zend/ModuleManager
-%exclude %{php_data_dir}/Zend/ModuleManager/*.md
-%exclude %{php_data_dir}/Zend/ModuleManager/composer.json
 
 %files Mvc
 %defattr(644,root,root,755)
-%doc library/Zend/Mvc/*.md
-%doc library/Zend/Mvc/composer.json
+%doc doc/Mvc/*.md
+%doc doc/Mvc/composer.json
 %{php_data_dir}/Zend/Mvc
-%exclude %{php_data_dir}/Zend/Mvc/*.md
-%exclude %{php_data_dir}/Zend/Mvc/composer.json
 
 %files Navigation
 %defattr(644,root,root,755)
-%doc library/Zend/Navigation/*.md
-%doc library/Zend/Navigation/composer.json
+%doc doc/Navigation/*.md
+%doc doc/Navigation/composer.json
 %{php_data_dir}/Zend/Navigation
-%exclude %{php_data_dir}/Zend/Navigation/*.md
-%exclude %{php_data_dir}/Zend/Navigation/composer.json
 
 %files Paginator
 %defattr(644,root,root,755)
-%doc library/Zend/Paginator/*.md
-%doc library/Zend/Paginator/composer.json
+%doc doc/Paginator/*.md
+%doc doc/Paginator/composer.json
 %{php_data_dir}/Zend/Paginator
-%exclude %{php_data_dir}/Zend/Paginator/*.md
-%exclude %{php_data_dir}/Zend/Paginator/composer.json
 
 %files Permissions-Acl
 %defattr(644,root,root,755)
-%doc library/Zend/Permissions/Acl/*.md
-%doc library/Zend/Permissions/Acl/composer.json
+%doc doc/Permissions/Acl/*.md
+%doc doc/Permissions/Acl/composer.json
 %dir %{php_data_dir}/Zend/Permissions
 %{php_data_dir}/Zend/Permissions/Acl
-%exclude %{php_data_dir}/Zend/Permissions/Acl/*.md
-%exclude %{php_data_dir}/Zend/Permissions/Acl/composer.json
 
 %files Permissions-Rbac
 %defattr(644,root,root,755)
-%doc library/Zend/Permissions/Rbac/*.md
-%doc library/Zend/Permissions/Rbac/composer.json
+%doc doc/Permissions/Rbac/*.md
+%doc doc/Permissions/Rbac/composer.json
 %dir %{php_data_dir}/Zend/Permissions
 %{php_data_dir}/Zend/Permissions/Rbac
-%exclude %{php_data_dir}/Zend/Permissions/Rbac/*.md
-%exclude %{php_data_dir}/Zend/Permissions/Rbac/composer.json
 
 %files ProgressBar
 %defattr(644,root,root,755)
-%doc library/Zend/ProgressBar/*.md
-%doc library/Zend/ProgressBar/composer.json
+%doc doc/ProgressBar/*.md
+%doc doc/ProgressBar/composer.json
 %{php_data_dir}/Zend/ProgressBar
-%exclude %{php_data_dir}/Zend/ProgressBar/*.md
-%exclude %{php_data_dir}/Zend/ProgressBar/composer.json
 
 %files Serializer
 %defattr(644,root,root,755)
-%doc library/Zend/Serializer/*.md
-%doc library/Zend/Serializer/composer.json
+%doc doc/Serializer/*.md
+%doc doc/Serializer/composer.json
 %{php_data_dir}/Zend/Serializer
-%exclude %{php_data_dir}/Zend/Serializer/*.md
-%exclude %{php_data_dir}/Zend/Serializer/composer.json
 
 %files Server
 %defattr(644,root,root,755)
-%doc library/Zend/Server/*.md
-%doc library/Zend/Server/composer.json
+%doc doc/Server/*.md
+%doc doc/Server/composer.json
 %{php_data_dir}/Zend/Server
-%exclude %{php_data_dir}/Zend/Server/*.md
-%exclude %{php_data_dir}/Zend/Server/composer.json
 
 %files ServiceManager
 %defattr(644,root,root,755)
-%doc library/Zend/ServiceManager/*.md
-%doc library/Zend/ServiceManager/composer.json
+%doc doc/ServiceManager/*.md
+%doc doc/ServiceManager/composer.json
 %{php_data_dir}/Zend/ServiceManager
-%exclude %{php_data_dir}/Zend/ServiceManager/*.md
-%exclude %{php_data_dir}/Zend/ServiceManager/composer.json
 
 %files Session
 %defattr(644,root,root,755)
-%doc library/Zend/Session/*.md
-%doc library/Zend/Session/composer.json
+%doc doc/Session/*.md
+%doc doc/Session/composer.json
 %{php_data_dir}/Zend/Session
-%exclude %{php_data_dir}/Zend/Session/*.md
-%exclude %{php_data_dir}/Zend/Session/composer.json
 
 %files Soap
 %defattr(644,root,root,755)
-%doc library/Zend/Soap/*.md
-%doc library/Zend/Soap/composer.json
+%doc doc/Soap/*.md
+%doc doc/Soap/composer.json
 %{php_data_dir}/Zend/Soap
-%exclude %{php_data_dir}/Zend/Soap/*.md
-%exclude %{php_data_dir}/Zend/Soap/composer.json
 
 %files Stdlib
 %defattr(644,root,root,755)
-%doc library/Zend/Stdlib/*.md
-%doc library/Zend/Stdlib/composer.json
+%doc doc/Stdlib/*.md
+%doc doc/Stdlib/composer.json
 %{php_data_dir}/Zend/Stdlib
-%exclude %{php_data_dir}/Zend/Stdlib/*.md
-%exclude %{php_data_dir}/Zend/Stdlib/composer.json
 
 %files Tag
 %defattr(644,root,root,755)
-%doc library/Zend/Tag/*.md
-%doc library/Zend/Tag/composer.json
+%doc doc/Tag/*.md
+%doc doc/Tag/composer.json
 %{php_data_dir}/Zend/Tag
-%exclude %{php_data_dir}/Zend/Tag/*.md
-%exclude %{php_data_dir}/Zend/Tag/composer.json
 
 %files Test
 %defattr(644,root,root,755)
-%doc library/Zend/Test/*.md
-%doc library/Zend/Test/composer.json
+%doc doc/Test/*.md
+%doc doc/Test/composer.json
 %{php_data_dir}/Zend/Test
-%exclude %{php_data_dir}/Zend/Test/*.md
-%exclude %{php_data_dir}/Zend/Test/composer.json
 
 %files Text
 %defattr(644,root,root,755)
-%doc library/Zend/Text/*.md
-%doc library/Zend/Text/composer.json
+%doc doc/Text/*.md
+%doc doc/Text/composer.json
 %{php_data_dir}/Zend/Text
-%exclude %{php_data_dir}/Zend/Text/*.md
-%exclude %{php_data_dir}/Zend/Text/composer.json
 
 %files Uri
 %defattr(644,root,root,755)
-%doc library/Zend/Uri/*.md
-%doc library/Zend/Uri/composer.json
+%doc doc/Uri/*.md
+%doc doc/Uri/composer.json
 %{php_data_dir}/Zend/Uri
-%exclude %{php_data_dir}/Zend/Uri/*.md
-%exclude %{php_data_dir}/Zend/Uri/composer.json
 
 %files Validator
 %defattr(644,root,root,755)
-%doc library/Zend/Validator/*.md
-%doc library/Zend/Validator/composer.json
+%doc doc/Validator/*.md
+%doc doc/Validator/composer.json
 %{php_data_dir}/Zend/Validator
-%exclude %{php_data_dir}/Zend/Validator/*.md
-%exclude %{php_data_dir}/Zend/Validator/composer.json
 
 %files Version
 %defattr(644,root,root,755)
-%doc library/Zend/Version/*.md
-%doc library/Zend/Version/composer.json
+%doc doc/Version/*.md
+%doc doc/Version/composer.json
 %{php_data_dir}/Zend/Version
-%exclude %{php_data_dir}/Zend/Version/*.md
-%exclude %{php_data_dir}/Zend/Version/composer.json
 
 %files View
 %defattr(644,root,root,755)
-%doc library/Zend/View/*.md
-%doc library/Zend/View/composer.json
+%doc doc/View/*.md
+%doc doc/View/composer.json
 %{php_data_dir}/Zend/View
-%exclude %{php_data_dir}/Zend/View/*.md
-%exclude %{php_data_dir}/Zend/View/composer.json
 
 %files XmlRpc
 %defattr(644,root,root,755)
-%doc library/Zend/XmlRpc/*.md
-%doc library/Zend/XmlRpc/composer.json
+%doc doc/XmlRpc/*.md
+%doc doc/XmlRpc/composer.json
 %{php_data_dir}/Zend/XmlRpc
-%exclude %{php_data_dir}/Zend/XmlRpc/*.md
-%exclude %{php_data_dir}/Zend/XmlRpc/composer.json
 
 %files ZendXml
 %defattr(644,root,root,755)