readd emailadmin/setup folder to allow updates from before latetest 14.3 and require php < 7.0 for phpFreeChat

This commit is contained in:
Ralf Becker 2016-06-04 10:15:14 +02:00
parent abe41d8ecf
commit a98a273a06
3 changed files with 8 additions and 3 deletions

View File

@ -126,8 +126,9 @@ Description: web-based groupware suite - esync application
Package: egroupware-epl-phpfreechat Package: egroupware-epl-phpfreechat
Architecture: all Architecture: all
# phpFreeChat does NOT work with php7 (called php or php7 again, not php5!)
Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}), Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}),
${misc:Depends} ${misc:Depends}, php5 (>= 5.3.0)
Replaces: egroupware-phpfreechat Replaces: egroupware-phpfreechat
Conflicts: egroupware-phpfreechat Conflicts: egroupware-phpfreechat
Description: web-based groupware suite - chat application Description: web-based groupware suite - chat application

View File

@ -45,7 +45,7 @@ install: build
# install core modules # install core modules
for DIR in api admin home preferences addressbook setup doc pixelegg; do \ for DIR in api admin home emailadmin preferences addressbook setup doc pixelegg; do \
cd $(CURDIR)/$${DIR}; \ cd $(CURDIR)/$${DIR}; \
find $(FINDOPT) $(APPFILES) \ find $(FINDOPT) $(APPFILES) \
-exec $(INSTALL) {} $(CURDIR)/$(COREDIR)/$${DIR}/{} \; ; \ -exec $(INSTALL) {} $(CURDIR)/$(COREDIR)/$${DIR}/{} \; ; \

View File

@ -1,5 +1,5 @@
Name: egroupware-epl Name: egroupware-epl
Version: 16.1.20160525 Version: 16.1.20160603
Release: Release:
Summary: EGroupware is a web-based groupware suite written in php Summary: EGroupware is a web-based groupware suite written in php
Group: Web/Database Group: Web/Database
@ -11,6 +11,7 @@ Prefix: /usr/share
%define egwdir %{prefix}/egroupware %define egwdir %{prefix}/egroupware
%define egwdatadir /var/lib/egroupware %define egwdatadir /var/lib/egroupware
%define egw_packagename eGroupware %define egw_packagename eGroupware
%define egwdirname %{name}
# #
# Define opensuse_version to tell opensuse 11.1 (1110) from sles11 (1110) and suse 10.1 from sles 10 # Define opensuse_version to tell opensuse 11.1 (1110) from sles11 (1110) and suse 10.1 from sles 10
%if "0%{?suse_version:1}%{!?sles_version:0}" == "010" %if "0%{?suse_version:1}%{!?sles_version:0}" == "010"
@ -376,6 +377,8 @@ Summary: The EGroupware chat application
Group: Web/Database Group: Web/Database
AutoReqProv: no AutoReqProv: no
Requires: egw-compat >= %{version} Requires: egw-compat >= %{version}
# phpFreeChat does NOT work with php7
Requires: %{php} < 7.0.0
Obsoletes: %{egw_packagename}-phpfreechat Obsoletes: %{egw_packagename}-phpfreechat
%description phpfreechat %description phpfreechat
Chat with other EGroupware users. A port of phpFreeChat for EGroupware. Chat with other EGroupware users. A port of phpFreeChat for EGroupware.
@ -589,6 +592,7 @@ ln -s ../../..%{egwdatadir}/header.inc.php
%{egwdir}/admin %{egwdir}/admin
%{egwdir}/api %{egwdir}/api
%{egwdir}/doc %{egwdir}/doc
%{egwdir}/emailadmin
%{egwdir}/files %{egwdir}/files
%{egwdir}/home %{egwdir}/home
%{egwdir}/pixelegg %{egwdir}/pixelegg