Skip to content

Z
z-push
Commit ed4b4ecb authored by Manfred Kutas's avatar Manfred Kutas
Browse files
Options

Merge pull request #336 in ZP/z-push from develop to release/2.3 

ZP-1015
ZP-1016

* commit '2c514c06':
  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.
  ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.
parents 7b665111 2c514c06
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 13 deletions
build/deb/debian.control
View file @ ed4b4ecb
...@@ -8,7 +8,7 @@ Homepage: http://z-push.org ...@@ -8,7 +8,7 @@ Homepage: http://z-push.org
Package: z-push-common Package: z-push-common
Architecture: all Architecture: all
Depends: ${misc:Depends}, php5 (>= 5.4), php5-cli, php-soap Depends: ${misc:Depends}, php5 (>= 5.4) | php7.0, php5-cli | php7.0-cli, php-soap
Conflicts: d-push, z-push Conflicts: d-push, z-push
Replaces: d-push, z-push Replaces: d-push, z-push
Description: open source implementation of the ActiveSync protocol Description: open source implementation of the ActiveSync protocol
...@@ -20,13 +20,13 @@ Description: open source implementation of the ActiveSync protocol ...@@ -20,13 +20,13 @@ Description: open source implementation of the ActiveSync protocol
Package: z-push-backend-caldav Package: z-push-backend-caldav
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-curl, libawl-php Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-curl | php5-curl, libawl-php
Description: Z-Push caldav backend Description: Z-Push caldav backend
Backend for Z-Push, that adds the ability to connect to a caldav server Backend for Z-Push, that adds the ability to connect to a caldav server
Package: z-push-backend-carddav Package: z-push-backend-carddav
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-curl, php5-xsl Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-curl | php5-curl, php5-xsl | php7.0-xsl
Description: Z-Push carddav backend Description: Z-Push carddav backend
Backend for Z-Push, that adds the ability to connect to a carddav server Backend for Z-Push, that adds the ability to connect to a carddav server
...@@ -38,19 +38,19 @@ Description: Z-Push combined backend ...@@ -38,19 +38,19 @@ Description: Z-Push combined backend
Package: z-push-backend-imap Package: z-push-backend-imap
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-imap Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-imap | php5-imap
Description: Z-Push imap backend Description: Z-Push imap backend
Backend for Z-Push, that adds the ability to connect to a imap server Backend for Z-Push, that adds the ability to connect to a imap server
Package: z-push-backend-ldap Package: z-push-backend-ldap
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-ldap Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-ldap | php5-ldap
Description: Z-Push ldap backend Description: Z-Push ldap backend
Backend for Z-Push, that adds the ability to connect to a ldap server Backend for Z-Push, that adds the ability to connect to a ldap server
Package: z-push-backend-kopano Package: z-push-backend-kopano
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-mapi Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-mapi | php7-mapi
Description: Z-Push Kopano backend Description: Z-Push Kopano backend
Backend for Z-Push, that adds the ability to connect to a Kopano server Backend for Z-Push, that adds the ability to connect to a Kopano server
...@@ -62,7 +62,7 @@ Description: Z-Push for Kopano ...@@ -62,7 +62,7 @@ Description: Z-Push for Kopano
Package: z-push-kopano-gabsync Package: z-push-kopano-gabsync
Architecture: all Architecture: all
Depends: ${misc:Depends}, php5-mapi Depends: ${misc:Depends}, php5-mapi | php7-mapi
Description: GAB sync for Kopano Description: GAB sync for Kopano
Synchronizes a the global address book for the Kopano Outlook Extension Synchronizes a the global address book for the Kopano Outlook Extension
...@@ -74,19 +74,19 @@ Description: Z-Push ipc shared memory provider ...@@ -74,19 +74,19 @@ Description: Z-Push ipc shared memory provider
Package: z-push-ipc-memcached Package: z-push-ipc-memcached
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-memcached Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-memcached | php5-memcached
Description: Z-Push ipc memcached provider Description: Z-Push ipc memcached provider
Provider for Z-Push, that adds the ability to use ipc memcached Provider for Z-Push, that adds the ability to use ipc memcached
Package: z-push-backend-galsearch-ldap Package: z-push-backend-galsearch-ldap
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-ldap Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-ldap | php5-ldap
Description: Z-Push searchldap backend Description: Z-Push searchldap backend
Backend for Z-Push, that adds the ability to search a ldap server Backend for Z-Push, that adds the ability to search a ldap server
Package: z-push-state-sql Package: z-push-state-sql
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-mysql Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php-mysql | php5-mysql
Description: Z-Push mysql state backend Description: Z-Push mysql state backend
Backend for Z-Push, that adds the ability to save states in a mysql database Backend for Z-Push, that adds the ability to save states in a mysql database
...@@ -98,12 +98,12 @@ Description: Z-Push autodiscover ...@@ -98,12 +98,12 @@ Description: Z-Push autodiscover
Package: z-push-config-apache Package: z-push-config-apache
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), libapache2-mod-php5 Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), apache2, libapache2-mod-php | libapache2-mod-php5
Description: Z-Push apache configuration Description: Z-Push apache configuration
Z-push apache configuration files Z-push apache configuration files
Package: z-push-config-apache-autodiscover Package: z-push-config-apache-autodiscover
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-autodiscover (= ${binary:Version}), libapache2-mod-php5 Depends: ${misc:Depends}, z-push-autodiscover (= ${binary:Version}), apache2, libapache2-mod-php | libapache2-mod-php5
Description: Z-Push autodiscover apache configuration Description: Z-Push autodiscover apache configuration
Z-push autodiscover apache configuration files Z-push autodiscover apache configuration files
build/rpm/z-push.spec
View file @ ed4b4ecb
...@@ -32,10 +32,16 @@ Requires: php-posix ...@@ -32,10 +32,16 @@ Requires: php-posix
%else %else
Requires: php-process Requires: php-process
%endif %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 >= 5.4.0
Requires: php-soap Requires: php-soap
Requires: php-mbstring Requires: php-mbstring
%endif
%description -n %name-common %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. 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 ...@@ -133,9 +139,13 @@ Synchronizes a Kopano global address book
Summary: Z-Push ipc shared memory provider Summary: Z-Push ipc shared memory provider
Group: Productivity/Networking/Email/Utilities Group: Productivity/Networking/Email/Utilities
Requires: %name-common = %version 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-sysvshm
Requires: php-sysvsem Requires: php-sysvsem
Requires: php-pcntl Requires: php-pcntl
%endif
%description -n %name-ipc-sharedmemory %description -n %name-ipc-sharedmemory
Provider for Z-Push, that adds the ability to use ipc shared memory Provider for Z-Push, that adds the ability to use ipc shared memory
...@@ -197,8 +207,12 @@ Requires: %name-common = %version ...@@ -197,8 +207,12 @@ Requires: %name-common = %version
Requires: apache2 Requires: apache2
Requires: mod_php_any Requires: mod_php_any
%else %else
%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
Requires: httpd24-httpd
%else
Requires: httpd Requires: httpd
%endif %endif
%endif
%description -n %name-config-apache %description -n %name-config-apache
Z-push apache configuration files Z-push apache configuration files
...@@ -211,8 +225,12 @@ Requires: %name-autodiscover = %version ...@@ -211,8 +225,12 @@ Requires: %name-autodiscover = %version
Requires: apache2 Requires: apache2
Requires: mod_php_any Requires: mod_php_any
%else %else
%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
Requires: httpd24-httpd
%else
Requires: httpd Requires: httpd
%endif %endif
%endif
%description -n %name-config-apache-autodiscover %description -n %name-config-apache-autodiscover
Z-push autodiscover apache configuration files Z-push autodiscover apache configuration files
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment