commit yast2-mail

27 Oct 2006

Hello community,

here is the log from the commit of package yast2-mail
checked in at Fri Oct 27 18:50:33 CEST 2006.

--------

--- yast2-mail/yast2-mail.changes	2006-09-11 13:53:43.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-mail/yast2-mail.changes	2006-10-27 17:44:44.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 27 17:43:50 CEST 2006 - mvidner@suse.cz
+
+- Added and cleaned up schema piece for autoyast (mail.rnc).
+- 2.13.7
+
+-------------------------------------------------------------------

Old:
----
  yast2-mail-2.13.6.tar.bz2

New:
----
  yast2-mail-2.13.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.7FQbz6/_old	2006-10-27 18:50:12.000000000 +0200
+++ /var/tmp/diff_new_pack.7FQbz6/_new	2006-10-27 18:50:12.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-mail (Version 2.13.6)
+# spec file for package yast2-mail (Version 2.13.7)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-mail
-Version:        2.13.6
+Version:        2.13.7
 Release:        1
-License:        GPL
+License:        GNU General Public License (GPL) - all versions
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-mail-2.13.6.tar.bz2
+Source0:        yast2-mail-2.13.7.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
 # new firewall interface
@@ -61,7 +61,7 @@
     Martin Vidner <mvidner@suse.cz>
 
 %prep
-%setup -n yast2-mail-2.13.6
+%setup -n yast2-mail-2.13.7
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -95,6 +95,8 @@
 /usr/share/YaST2/modules/Mail.y*
 %dir %{prefix}/share/applications/YaST2
 %{prefix}/share/applications/YaST2/mail.desktop
+%dir /usr/share/YaST2/schema/autoyast/rnc
+/usr/share/YaST2/schema/autoyast/rnc/mail.rnc
 %dir /usr/share/YaST2/scrconf
 /usr/share/YaST2/scrconf/cfg_amavis.scr
 /usr/share/YaST2/scrconf/cfg_postfix.scr
@@ -122,6 +124,9 @@
 /usr/lib/YaST2/servers_non_y2/ag_mailtable
 
 %changelog -n yast2-mail
+* Fri Oct 27 2006 - mvidner@suse.cz
+- Added and cleaned up schema piece for autoyast (mail.rnc).
+- 2.13.7
 * Mon Sep 11 2006 - mvidner@suse.cz
 - Fixed Progress nesting (#202351).
 - Using autodocs-ycp.ami (with parentheses for automake-1.9.6).

++++++ yast2-mail-2.13.6.tar.bz2 -> yast2-mail-2.13.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/Makefile.am new/yast2-mail-2.13.7/Makefile.am
--- old/yast2-mail-2.13.6/Makefile.am	2006-09-11 17:16:34.000000000 +0200
+++ new/yast2-mail-2.13.7/Makefile.am	2006-10-27 18:15:48.000000000 +0200
@@ -67,7 +67,7 @@
 # because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
 	./config.status --file=$@:$<
 
 if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/Makefile.am.common new/yast2-mail-2.13.7/Makefile.am.common
--- old/yast2-mail-2.13.6/Makefile.am.common	2006-09-11 17:16:34.000000000 +0200
+++ new/yast2-mail-2.13.7/Makefile.am.common	2006-10-27 18:15:48.000000000 +0200
@@ -29,7 +29,19 @@
 
 dist-hook: check-syntax
 
+CHECK_SYNTAX = true
 check-syntax: $(client_DATA) $(ycpchook)
-	if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+	@if test "$(client_DATA)"; then \
+	  if $(CHECK_SYNTAX); then \
+	    TO_CHECK="$(filter %.ycp,$^)"; \
+	    echo "Checking syntax of $${TO_CHECK}"; \
+	    if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+	      echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+	      exit 1; \
+	    fi; \
+	  else \
+	    echo "Syntax check disabled"; \
+	  fi; \
+	fi
 
 -include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/Makefile.in new/yast2-mail-2.13.7/Makefile.in
--- old/yast2-mail-2.13.6/Makefile.in	2006-09-11 17:16:44.000000000 +0200
+++ new/yast2-mail-2.13.7/Makefile.in	2006-10-27 18:16:00.000000000 +0200
@@ -707,7 +707,7 @@
 # because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
 @CREATE_PKGCONFIG_TRUE@	./config.status --file=$@:$<
 
 dist-hook:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/VERSION new/yast2-mail-2.13.7/VERSION
--- old/yast2-mail-2.13.6/VERSION	2006-09-11 13:51:21.000000000 +0200
+++ new/yast2-mail-2.13.7/VERSION	2006-10-27 17:43:30.000000000 +0200
@@ -1 +1 @@
-2.13.6
+2.13.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/autodocs-ycp.ami new/yast2-mail-2.13.7/autodocs-ycp.ami
--- old/yast2-mail-2.13.6/autodocs-ycp.ami	2006-09-11 17:16:34.000000000 +0200
+++ new/yast2-mail-2.13.7/autodocs-ycp.ami	2006-10-27 18:15:48.000000000 +0200
@@ -1,5 +1,5 @@
 # -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
 
 # Builds source documentation for YCP sources
 # Uses ycpdoc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/configure new/yast2-mail-2.13.7/configure
--- old/yast2-mail-2.13.6/configure	2006-09-11 17:16:41.000000000 +0200
+++ new/yast2-mail-2.13.7/configure	2006-10-27 18:15:56.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-mail 2.13.6.
+# Generated by GNU Autoconf 2.59 for yast2-mail 2.13.7.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-mail'
 PACKAGE_TARNAME='yast2-mail'
-PACKAGE_VERSION='2.13.6'
-PACKAGE_STRING='yast2-mail 2.13.6'
+PACKAGE_VERSION='2.13.7'
+PACKAGE_STRING='yast2-mail 2.13.7'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures yast2-mail 2.13.6 to adapt to many kinds of systems.
+\`configure' configures yast2-mail 2.13.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -795,7 +795,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-mail 2.13.6:";;
+     short | recursive ) echo "Configuration of yast2-mail 2.13.7:";;
    esac
   cat <<\_ACEOF
 
@@ -908,7 +908,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-mail configure 2.13.6
+yast2-mail configure 2.13.7
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by yast2-mail $as_me 2.13.6, which was
+It was created by yast2-mail $as_me 2.13.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1652,7 +1652,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-mail'
- VERSION='2.13.6'
+ VERSION='2.13.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.6"
+VERSION="2.13.7"
 RPMNAME="yast2-mail"
 MAINTAINER="Martin Vidner <mvidner@suse.cz>"
 
@@ -2784,7 +2784,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-mail $as_me 2.13.6, which was
+This file was extended by yast2-mail $as_me 2.13.7, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2839,7 +2839,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-mail config.status 2.13.6
+yast2-mail config.status 2.13.7
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/configure.in new/yast2-mail-2.13.7/configure.in
--- old/yast2-mail-2.13.6/configure.in	2006-09-11 17:16:34.000000000 +0200
+++ new/yast2-mail-2.13.7/configure.in	2006-10-27 18:15:47.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-mail
 dnl
-dnl -- This file is generated by y2autoconf 2.13.24 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.26 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-mail, 2.13.6, http://bugs.opensuse.org/, yast2-mail)
+AC_INIT(yast2-mail, 2.13.7, http://bugs.opensuse.org/, yast2-mail)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.13.6"
+VERSION="2.13.7"
 RPMNAME="yast2-mail"
 MAINTAINER="Martin Vidner <mvidner@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/doc/autodocs/Makefile.in new/yast2-mail-2.13.7/doc/autodocs/Makefile.in
--- old/yast2-mail-2.13.6/doc/autodocs/Makefile.in	2006-09-11 17:16:43.000000000 +0200
+++ new/yast2-mail-2.13.7/doc/autodocs/Makefile.in	2006-10-27 18:15:59.000000000 +0200
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 # -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
 
 # Builds source documentation for YCP sources
 # Uses ycpdoc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/src/Makefile.am new/yast2-mail-2.13.7/src/Makefile.am
--- old/yast2-mail-2.13.6/src/Makefile.am	2006-09-05 10:08:45.000000000 +0200
+++ new/yast2-mail-2.13.7/src/Makefile.am	2006-10-27 18:04:31.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # Makefile.am for y2c_mail/src
 #
-# $Id: Makefile.am 15188 2004-03-02 13:48:13Z lslezak $
+# $Id: Makefile.am 33810 2006-10-27 16:04:29Z mvidner $
 #
 
 myyncludedir = $(yncludedir)/mail
@@ -23,11 +23,14 @@
 	MailAliases.ycp		\
 	Mail.ycp
 
+rncdir =  $(schemadir)/autoyast/rnc
+rnc_DATA = mail.rnc
+
 mail:
 	ln -sf . mail
 
 ycpchook = mail
 
-EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA)
+EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/src/Makefile.in new/yast2-mail-2.13.7/src/Makefile.in
--- old/yast2-mail-2.13.6/src/Makefile.in	2006-09-11 17:16:43.000000000 +0200
+++ new/yast2-mail-2.13.7/src/Makefile.in	2006-10-27 18:15:59.000000000 +0200
@@ -17,7 +17,7 @@
 #
 # Makefile.am for y2c_mail/src
 #
-# $Id: Makefile.am 15188 2004-03-02 13:48:13Z lslezak $
+# $Id: Makefile.am 33810 2006-10-27 16:04:29Z mvidner $
 #
 
 # Makefile.am.common					-*- Makefile -*-
@@ -65,14 +65,15 @@
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \
 	"$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \
-	"$(DESTDIR)$(myyncludedir)"
+	"$(DESTDIR)$(myyncludedir)" "$(DESTDIR)$(rncdir)"
 clientDATA_INSTALL = $(INSTALL_DATA)
 desktopDATA_INSTALL = $(INSTALL_DATA)
 moduleDATA_INSTALL = $(INSTALL_DATA)
 modulebinDATA_INSTALL = $(INSTALL_DATA)
 myyncludeDATA_INSTALL = $(INSTALL_DATA)
+rncDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \
-	$(myynclude_DATA)
+	$(myynclude_DATA) $(rnc_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -198,8 +199,10 @@
 	MailAliases.ycp		\
 	Mail.ycp
 
+rncdir = $(schemadir)/autoyast/rnc
+rnc_DATA = mail.rnc
 ycpchook = mail
-EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA)
+EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
 modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
 modulebindir = $(moduledir)
 ybcfiles = $(filter %.ybc,$(modulebin_DATA))
@@ -212,6 +215,7 @@
 # where ycpchook contains a symlink to "."
 # Otherwise "." keeps being newer than .dep and we loop.
 NEWDEP = ${top_builddir}/.dep.new
+CHECK_SYNTAX = true
 all: all-am
 
 .SUFFIXES:
@@ -330,6 +334,23 @@
 	  echo " rm -f '$(DESTDIR)$(myyncludedir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(myyncludedir)/$$f"; \
 	done
+install-rncDATA: $(rnc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(rncdir)" || $(mkdir_p) "$(DESTDIR)$(rncdir)"
+	@list='$(rnc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(rncDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rncdir)/$$f'"; \
+	  $(rncDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rncdir)/$$f"; \
+	done
+
+uninstall-rncDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(rnc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(rncdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(rncdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -372,7 +393,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(myyncludedir)"; do \
+	for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(myyncludedir)" "$(DESTDIR)$(rncdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -420,7 +441,8 @@
 info-am:
 
 install-data-am: install-clientDATA install-desktopDATA \
-	install-moduleDATA install-modulebinDATA install-myyncludeDATA
+	install-moduleDATA install-modulebinDATA install-myyncludeDATA \
+	install-rncDATA
 
 install-exec-am:
 
@@ -448,7 +470,7 @@
 
 uninstall-am: uninstall-clientDATA uninstall-desktopDATA \
 	uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \
-	uninstall-myyncludeDATA
+	uninstall-myyncludeDATA uninstall-rncDATA
 
 .PHONY: all all-am check check-am clean clean-generic dist-hook \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
@@ -456,12 +478,12 @@
 	install-data install-data-am install-desktopDATA install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-moduleDATA install-modulebinDATA install-myyncludeDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-clientDATA uninstall-desktopDATA uninstall-info-am \
-	uninstall-moduleDATA uninstall-modulebinDATA \
-	uninstall-myyncludeDATA
+	install-rncDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-clientDATA uninstall-desktopDATA \
+	uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \
+	uninstall-myyncludeDATA uninstall-rncDATA
 
 
 mail:
@@ -480,9 +502,19 @@
 	rm ${NEWDEP}
 
 dist-hook: check-syntax
-
 check-syntax: $(client_DATA) $(ycpchook)
-	if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+	@if test "$(client_DATA)"; then \
+	  if $(CHECK_SYNTAX); then \
+	    TO_CHECK="$(filter %.ycp,$^)"; \
+	    echo "Checking syntax of $${TO_CHECK}"; \
+	    if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+	      echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+	      exit 1; \
+	    fi; \
+	  else \
+	    echo "Syntax check disabled"; \
+	  fi; \
+	fi
 
 -include .dep
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/src/mail.desktop new/yast2-mail-2.13.7/src/mail.desktop
--- old/yast2-mail-2.13.6/src/mail.desktop	2006-09-05 10:08:45.000000000 +0200
+++ new/yast2-mail-2.13.7/src/mail.desktop	2006-10-27 16:57:55.000000000 +0200
@@ -15,6 +15,7 @@
 X-SuSE-YaST-Geometry=
 X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=mail.rnc
 
 Icon=yast-mail
 Exec=/sbin/yast2 mail 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.13.6/src/mail.rnc new/yast2-mail-2.13.7/src/mail.rnc
--- old/yast2-mail-2.13.6/src/mail.rnc	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-mail-2.13.7/src/mail.rnc	2006-10-27 17:36:22.000000000 +0200
@@ -0,0 +1,104 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+mail =
+  element mail {
+    aliases? &
+    connection_type &
+    fetchmail? &
+    from_header? &
+    listen_remote? &
+    local_domains? &
+    masquerade_other_domains? &
+    masquerade_users? &
+    mta &
+    outgoing_mail_server? &
+    postfix_mda? &
+    use_amavis? &
+    virtual_users?
+  }
+
+# we have code to accept it as symbol or string
+mail_SYMBOL_OR_TEXT =
+  attribute config:type { "symbol" }? 
+
+aliases =
+  element aliases {
+    LIST,
+    element alias {
+      element alias { text } &
+      element destinations { text } &
+      element comment { text }
+    }*
+  }
+
+connection_type =
+  element connection_type {
+    mail_SYMBOL_OR_TEXT,
+    ( "permanent" | "dialup" | "none" )
+  }
+
+fetchmail =
+  element fetchmail {
+    LIST,
+    element fetchmail_entry {
+      element server { text } &
+      element protocol { text } &
+      element remote_user { text } &
+      element local_user { text } &
+      element password { text }
+    }+
+  }
+
+from_header = element from_header { text }
+
+listen_remote = element listen_remote { BOOLEAN }
+
+local_domains =
+  element local_domains {
+    LIST,
+    element domains { text }*
+  }
+
+masquerade_other_domains =
+  element masquerade_other_domains {
+    LIST,
+    element domain { text }*
+  }
+
+masquerade_users =
+  element masquerade_users {
+    LIST,
+    element masquerade_user {
+      element user { text } &
+      element address { text } &
+      element comment { text }?
+    }*
+  }
+
+mta =
+  element mta {
+    mail_SYMBOL_OR_TEXT,
+    ( "sendmail" | "postfix" )
+  }
+
+outgoing_mail_server = element outgoing_mail_server { text }
+
+postfix_mda =
+  element postfix_mda {
+    mail_SYMBOL_OR_TEXT,
+    ( "local" | "procmail" | "cyrus" )
+  }
+
+use_amavis = element use_amavis { BOOLEAN }
+
+virtual_users =
+  element virtual_users {
+    LIST,
+    element virtual_user {
+      element alias { text } &
+      element destinations { text } &
+      element comment { text }?
+    }*
+  }


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)