From a98a273a06cce508a25c0e4b2a77d97dba396446 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Sat, 4 Jun 2016 10:15:14 +0200
Subject: [PATCH] readd emailadmin/setup folder to allow updates from before
 latetest 14.3 and require php < 7.0 for phpFreeChat

---
 doc/rpm-build/debian.control      | 3 ++-
 doc/rpm-build/debian.rules        | 2 +-
 doc/rpm-build/egroupware-epl.spec | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/rpm-build/debian.control b/doc/rpm-build/debian.control
index b4fed9dc31..f88dcdf038 100644
--- a/doc/rpm-build/debian.control
+++ b/doc/rpm-build/debian.control
@@ -126,8 +126,9 @@ Description: web-based groupware suite - esync application
 
 Package: egroupware-epl-phpfreechat
 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}),
- ${misc:Depends}
+ ${misc:Depends}, php5 (>= 5.3.0)
 Replaces: egroupware-phpfreechat
 Conflicts: egroupware-phpfreechat
 Description: web-based groupware suite - chat application
diff --git a/doc/rpm-build/debian.rules b/doc/rpm-build/debian.rules
index 3540d0e398..bda52b9a13 100644
--- a/doc/rpm-build/debian.rules
+++ b/doc/rpm-build/debian.rules
@@ -45,7 +45,7 @@ install: build
 
 	# 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}; \
 	  find $(FINDOPT) $(APPFILES) \
 	    -exec $(INSTALL) {} $(CURDIR)/$(COREDIR)/$${DIR}/{} \; ; \
diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec
index 64f1085b99..732fbbfda1 100644
--- a/doc/rpm-build/egroupware-epl.spec
+++ b/doc/rpm-build/egroupware-epl.spec
@@ -1,5 +1,5 @@
 Name: egroupware-epl
-Version: 16.1.20160525
+Version: 16.1.20160603
 Release:
 Summary: EGroupware is a web-based groupware suite written in php
 Group: Web/Database
@@ -11,6 +11,7 @@ Prefix: /usr/share
 %define egwdir %{prefix}/egroupware
 %define egwdatadir /var/lib/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
 %if "0%{?suse_version:1}%{!?sles_version:0}" == "010"
@@ -376,6 +377,8 @@ Summary: The EGroupware chat application
 Group: Web/Database
 AutoReqProv: no
 Requires: egw-compat >= %{version}
+# phpFreeChat does NOT work with php7
+Requires: %{php} < 7.0.0
 Obsoletes: %{egw_packagename}-phpfreechat
 %description phpfreechat
 Chat with other EGroupware users. A port of phpFreeChat for EGroupware.
@@ -589,6 +592,7 @@ ln -s ../../..%{egwdatadir}/header.inc.php
 %{egwdir}/admin
 %{egwdir}/api
 %{egwdir}/doc
+%{egwdir}/emailadmin
 %{egwdir}/files
 %{egwdir}/home
 %{egwdir}/pixelegg