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

Merge pull request #335 in ZP/z-push from bugfix/ZP-1016-further-improve-rhel-scl-packaging to develop

* commit '92f6052d':
  ZP-1016 Further improve RHEL*SCL packaging. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1016 Further improve RHEL*SCL packaging. Released under the Affero GNU General Public License (AGPL) version 3.

build/rpm/z-push.spec

@@ -32,10 +32,16 @@ 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
+Requires:   rh-php56-php-mbstring
+Requires:   rh-php56-php-process
+%else
 Requires:   php >= 5.4.0
 Requires:   php-soap
 Requires:   php-mbstring
-
+%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.
 
@@ -133,9 +139,13 @@ Synchronizes a Kopano global address book
 Summary:    Z-Push ipc shared memory provider
 Group:      Productivity/Networking/Email/Utilities
 Requires:   %name-common = %version
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   rh-php56-php-process
+%else
 Requires:   php-sysvshm
 Requires:   php-sysvsem
 Requires:   php-pcntl
+%endif
 
 %description -n %name-ipc-sharedmemory
 Provider for Z-Push, that adds the ability to use ipc shared memory
@@ -197,8 +207,12 @@ Requires:   %name-common = %version
 Requires:   apache2
 Requires:   mod_php_any
 %else
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   httpd24-httpd
+%else
 Requires:   httpd
 %endif
+%endif
 
 %description -n %name-config-apache
 Z-push apache configuration files
@@ -211,8 +225,12 @@ Requires:   %name-autodiscover = %version
 Requires:   apache2
 Requires:   mod_php_any
 %else
+%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+Requires:   httpd24-httpd
+%else
 Requires:   httpd
 %endif
+%endif
 
 %description -n %name-config-apache-autodiscover
 Z-push autodiscover apache configuration files