#269867 - build cycle between yast2-users and yast2-mail

svn path=/trunk/mail/; revision=37805
yast · May 3, 2007 · 2b53a52 · 2b53a52
1 parent 77ca54e
commit 2b53a52
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 218 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.15.6
+2.15.7
diff --git a/package/yast2-mail.changes b/package/yast2-mail.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May  3 14:46:39 CEST 2007 - varkoly@suse.de
+
+- Add new modul file MailAlias.ycp (269867 - build cycle between yast2-users and yast2-mail) 
+- 2.15.7
+
+-------------------------------------------------------------------
+Wed May  2 19:35:54 CEST 2007 - aj@suse.de
+
+- Require perl-NetxAP for Net::IMAP (#270647).
+
 -------------------------------------------------------------------
 Mon Apr 23 10:19:17 CEST 2007 - varkoly@suse.de
 

diff --git a/src/MailAliases.ycp b/src/MailAliases.ycp
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -33,7 +33,6 @@ desktop_DATA =			\
 	mail.desktop
 
 module_DATA =			\
-	MailAliases.ycp		\
 	MailTable.pm		\
 	MailTableInclude.pm	\
 	Mail.ycp		\

diff --git a/testsuite/tests/readwrite.ycp b/testsuite/tests/readwrite.ycp
@@ -9,7 +9,7 @@
  * $Id$
  */
 {
-    // testedfiles: Mail.ycp MailTable.pm MailTableInclude.pm MailAliases.ycp Package.ycp PackageSystem.ycp Report.ycp Require.ycp Service.ycp Testsuite.ycp
+    // testedfiles: Mail.ycp MailTable.pm MailTableInclude.pm Package.ycp PackageSystem.ycp Report.ycp Require.ycp Service.ycp Testsuite.ycp
 
     include "testsuite.ycp";
 

diff --git a/yast2-mail.spec.in b/yast2-mail.spec.in
@@ -5,12 +5,9 @@ BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-t
 BuildRequires:	yast2-perl-bindings yast2-ldap-server yast2-users yast2-network
 # new firewall interface
 Requires:	yast2 >= 2.11.11
-Requires:	yast2-mail-aliases
-# for listing local users as alias destinations
 Requires:	yast2-users
-# because of listing users too. probably could be hidden in
-# yast2-users easily
 Requires:	yast2-ldap
+Requires:       perl-NetxAP
 
 Provides:	yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp
 Provides:	yast2-config-sendmail yast2-config-sendmail-devel