Merge pull request #462 in ZP/z-push from...

Merge pull request #462 in ZP/z-push from bugfix/ZP-1129-z-push-does-not-install-on-rhel_7_php_56 to develop

* commit '04306211':
  ZP-1129 Fix dependencies for RHEL_7_PHP_56 and RHEL_6_PHP_56.
  ZP-1129 Fix dependencies for RHEL_7_PHP_56 and RHEL_6_PHP_56.
  ZP-1129 Fix dependencies for RHEL_7_PHP_56 and RHEL_6_PHP_56.

build/rpm/z-push.spec

@@ -27,11 +27,6 @@ Z-push is an implementation of the ActiveSync protocol which is used 'over-the-a
 Summary:    Z-Push core package
 Group:      Productivity/Networking/Email/Utilities
 
-%if 0%{?suse_version}
-Requires:   php-posix
-%else
-Requires:   php-process
-%endif
 %if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
 Requires:   rh-php56
 Requires:   rh-php56-php-soap
@@ -41,6 +36,11 @@ Requires:   rh-php56-php-process
 Requires:   php >= 5.4.0
 Requires:   php-soap
 Requires:   php-mbstring
+%if 0%{?suse_version}
+Requires:   php-posix
+%else
+Requires:   php-process
+%endif
 %endif
 %description -n %name-common
 Z-push is an implementation of the ActiveSync protocol which is used 'over-the-air' for multi platform ActiveSync devices. Devices supported are including Windows Mobile, Android, iPhone, and Nokia. With Z-push any groupware can be connected and synced with these devices.
@@ -50,8 +50,15 @@ Z-push is an implementation of the ActiveSync protocol which is used 'over-the-a
 Summary:    Z-Push caldav backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
-Requires:   php-curl
 Requires:   libawl-php
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-common
+Requires:   rh-php56-php-xml
+%else
+Requires:   php-curl
+Requires:   php-xml
+%endif
+
 Provides:   %name-backend
 
 %description -n %name-backend-caldav
@@ -84,8 +91,12 @@ Backend for Z-Push, that adds the ability to combine backends.
 Summary:    Z-Push imap backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
-Requires:   php-imap
 Requires:   libawl-php
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-imap
+%else
+Requires:   php-imap
+%endif
 Provides:   %name-backend
 
 %description -n %name-backend-imap
@@ -96,7 +107,11 @@ Backend for Z-Push, that adds the ability to connect to a imap server
 Summary:    Z-Push ldap backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-ldap
+%else
 Requires:   php-ldap
+%endif
 Provides:   %name-backend
 
 %description -n %name-backend-ldap
@@ -165,12 +180,16 @@ Provider for Z-Push, that adds the ability to use ipc shared memory
 Summary:    Z-Push ipc memcached provider
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
+Requires:   memcached
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-pecl-memcache
+%else
 %if 0%{?suse_version}
 Requires:   php5-memcached
 %else
-Requires:   memcached
 Requires:   php-pecl-memcached
 %endif
+%endif
 
 %description -n %name-ipc-memcached
 Provider for Z-Push, that adds the ability to use ipc memcached
@@ -180,7 +199,11 @@ Provider for Z-Push, that adds the ability to use ipc memcached
 Summary:    Z-Push ldap search backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-ldap
+%else
 Requires:   php-ldap
+%endif
 Provides:   %name-backend
 
 %description -n %name-galsearch-ldap
@@ -191,8 +214,13 @@ Backend for Z-Push, that adds the ability to search a ldap server
 Summary:    Z-Push mysql state backend
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-mysqlnd
+Requires:   rh-php56-php-pdo
+%else
 Requires:   php-mysql
 Requires:   php-pdo
+%endif
 
 %description -n %name-state-sql
 Backend for Z-Push, that adds the ability to save states in a mysql database