first merged version

svn path=/trunk/mail/; revision=37610

BEFOR_MERGED

@@ -0,0 +1 @@
+37587

MAINTAINER

@@ -1 +1 @@
-Martin Vidner <mvidner@suse.cz>
+Peter Varkoly <varkoly@novell.com>

VERSION

@@ -1 +1 @@
-2.15.3
+2.15.4

agents/Makefile.am

@@ -4,7 +4,16 @@
 # $Id$
 #
 
-agent_SCRIPTS = ag_fetchmailrc ag_smtp_auth ag_mailtable
+agent_SCRIPTS = ag_fetchmailrc \
+		ag_smtp_auth \
+		ag_mailtable \
+		\
+		ag_mailconfig \
+		ag_postfix_mastercf \
+		MasterCFParser.pm \
+		ag_mail_ldaptable \
+                ag_cyrus_conf \
+		CyrusConfParser.pm
 
 scrconf_DATA = \
 	cfg_amavis.scr		\
@@ -18,7 +27,16 @@ scrconf_DATA = \
 	mail_p_virtual.scr	\
 	mail_s_auth.scr		\
 	mail_s_generics.scr	\
-	mail_s_virtuser.scr
+	mail_s_virtuser.scr     \
+	\
+	mail_maincf.scr \
+	mail_saslpasswd.scr \
+	mail_mastercf.scr \
+	etc_imapd_conf.scr \
+        mail_ldaptable.scr \
+	mail_cyrusconf.scr \
+	cfg_fetchmail.scr
+
 
 # ag_fetchmailrc is tested in testsuite dir
 TESTS = test-mailtable

src/Makefile.am

@@ -4,17 +4,29 @@
 # $Id$
 #
 
+SUBDIRS = YaPI
+
 myyncludedir = $(yncludedir)/mail
 
 client_DATA =			\
 	mail.ycp		\
-	mail_auto.ycp
+	mail_auto.ycp		\
+	\
+        mail-server.ycp         \
+        mail-server_auto.ycp    \
+        mail-server_proposal.ycp
+
 
 myynclude_DATA =		\
 	helps.ycp		\
 	wj.ycp			\
 	widgets.ycp		\
-	ui.ycp
+	ui.ycp			\
+	\
+	mail-server_helps.ycp   \
+        mail-server_wizards.ycp \
+        mail-server_dialogs.ycp \
+        mail-server_complex.ycp
 
 desktop_DATA =			\
 	mail.desktop
@@ -23,7 +35,11 @@ module_DATA =			\
 	MailAliases.ycp		\
 	MailTable.pm		\
 	MailTableInclude.pm	\
-	Mail.ycp
+	Mail.ycp		\
+	\
+	MailServer.ycp
+
+schema_DATA = suse-mailserver.schema
 
 rncdir =  $(schemadir)/autoyast/rnc
 rnc_DATA = mail.rnc
@@ -33,6 +49,7 @@ mail:
 
 ycpchook = mail
 
-EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
+EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA) \
+             $(schema_DATA)
 
 include $(top_srcdir)/Makefile.am.common

yast2-mail.spec.in

@@ -21,6 +21,8 @@ Provides:	yast2-config-mail
 Obsoletes:	yast2-config-mail
 Provides:	yast2-trans-mail
 Obsoletes:	yast2-trans-mail
+Provides:	yast2-mail-server
+Obsoletes:	yast2-mail-server
 
 BuildArchitectures:	noarch
 
@@ -52,7 +54,9 @@ Group:		System/YaST
 @clientdir@/mail.ycp
 @clientdir@/mail_*.ycp
 %dir @moduledir@
-@moduledir@/Mail.y*
+%dir @moduledir@/YaPI
+@moduledir@/Mail*
+@moduledir@/YaPI/Mail*
 %dir @desktopdir@
 @desktopdir@/mail.desktop
 %dir @schemadir@/autoyast/rnc
@@ -67,20 +71,17 @@ Group:		System/YaST
 @scrconfdir@/mail_s_auth.scr
 @scrconfdir@/mail_s_generics.scr
 @scrconfdir@/mail_s_virtuser.scr
-%dir @agentdir@
-@agentdir@/ag_smtp_auth
-%doc @docdir@
-
-%files aliases
-%defattr(-,root,root)
-%dir @moduledir@
-@moduledir@/MailAliases.y*
-@moduledir@/MailTable.pm
-@moduledir@/MailTableInclude.pm
-%dir @scrconfdir@
 @scrconfdir@/cfg_mail.scr
 @scrconfdir@/mail_aliases.scr
 @scrconfdir@/mail_fetchmail.scr
 %dir @agentdir@
+@agentdir@/ag_smtp_auth
 @agentdir@/ag_fetchmailrc
 @agentdir@/ag_mailtable
+%doc @docdir@
+
+%dir /etc/openldap/schema/
+/etc/openldap/schema/suse-mailserver.schema
+/etc/permissions.d/mail-server*
+%doc @docdir@
+