Moved cfg_mail.scr to yast2.

yast · Mar 17, 2016 · 92c6c36 · 92c6c36
1 parent b56b9bf
commit 92c6c36
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 33 deletions.
diff --git a/package/yast2-mail.changes b/package/yast2-mail.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 16 16:04:55 UTC 2016 - knut.anderssen@suse.com
+
+- Moved cfg_mail.scr to yast2 due to circular dependencies with
+  yast2-security and yast2-users.
+- 3.1.7
+
 -------------------------------------------------------------------
 Tue Nov 17 09:21:07 UTC 2015 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-mail.spec b/package/yast2-mail.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-mail
-Version:        3.1.6
+Version:        3.1.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,8 @@ PreReq:         %fillup_prereq
 
 # new firewall interface
 # Wizard::SetDesktopTitleAndIcon
-Requires:	yast2 >= 2.21.22
+# cfg_mail.scr
+Requires:	yast2 >= 3.1.179
 Requires:	yast2-users
 Requires:	yast2-ldap
 Provides:	yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -23,7 +23,6 @@ scrconf_DATA = \
   scrconf/mail_fetchmail.scr \
   scrconf/cfg_fetchmail.scr \
   scrconf/cfg_sendmail.scr \
-  scrconf/cfg_mail.scr \
   scrconf/mail_p_auth.scr \
   scrconf/mail_p_virtual.scr \
   scrconf/mail_ldaptable.scr \

diff --git a/src/scrconf/cfg_mail.scr b/src/scrconf/cfg_mail.scr