Hello community,

here is the log from the commit of package yast2-installation-control for 
openSUSE:Factory checked in at 2014-05-17 22:01:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation-control.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation-control"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes
    2014-04-26 11:45:07.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation-control.new/yast2-installation-control.changes
       2014-05-17 22:01:59.000000000 +0200
@@ -1,0 +2,15 @@
+Fri May 16 15:51:37 CEST 2014 - loci...@suse.com
+
+- Added software->optional_default_patterns - optional patterns
+  selected for installation by default that do not cause reporting
+  an error if they are missing (bnc#876760)
+- 3.1.8
+
+-------------------------------------------------------------------
+Thu May 15 10:40:04 CEST 2014 - loci...@suse.com
+
+- Added software->upgrade->window_managers to handle upgrading
+  the system based on the default windowmanager (bnc#874116)
+- 3.1.7
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-control-3.1.6.tar.bz2

New:
----
  yast2-installation-control-3.1.8.tar.bz2

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

Other differences:
------------------
++++++ yast2-installation-control.spec ++++++
--- /var/tmp/diff_new_pack.hUrC7T/_old  2014-05-17 22:02:00.000000000 +0200
+++ /var/tmp/diff_new_pack.hUrC7T/_new  2014-05-17 22:02:00.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation-control
-Version:        3.1.6
+Version:        3.1.8
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-installation-control-3.1.6.tar.bz2 -> 
yast2-installation-control-3.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-control-3.1.6/control/control.rnc 
new/yast2-installation-control-3.1.8/control/control.rnc
--- old/yast2-installation-control-3.1.6/control/control.rnc    2014-04-18 
10:42:40.000000000 +0200
+++ new/yast2-installation-control-3.1.8/control/control.rnc    2014-05-16 
16:02:46.000000000 +0200
@@ -260,6 +260,8 @@
     | kernel_packages
     | packages_transmogrify
     | default_patterns
+    | optional_default_patterns
+    | upgrade
 
 ## Whether it is allowed to delete a package during upgrade
 delete_old_packages = element delete_old_packages { BOOLEAN }
@@ -369,9 +371,45 @@
     element package { text }+
 }
 
-## Comma and/or space-separated list of default patterns selected for 
installation
+## Space-separated list of default patterns selected for installation.
+## If such a pattern doesn't exist, error is reported. To omit reporting
+## such error, use optional_default_patterns instead.
+## These patterns are not selected in auto-installation.
 default_patterns = element default_patterns { text }
 
+## Space-separated list of (optional) default patterns for installation.
+## These patterns will be selected only if they exist and thus it will
+## never report any error if a pattern is not found. Use default_patterns
+## for mandatory default patterns.
+## These patterns are not selected in auto-installation.
+optional_default_patterns = element optional_default_patterns { text }
+
+## Defines behavior during upgrade
+upgrade = element upgrade {
+    ## Optional list of upgrade paths for default window manager set
+    ## in /etc/sysconfig/windowmanager:DEFAULT_WM (not all cases need to be 
handled)
+    element window_managers {
+        LIST,
+        element window_manager {
+          ## Windowmanager as found in /etc/sysconfig/windowmanager:DEFAULT_WM
+          ## This entry is mandatory
+          element sysconfig_wm { text } &
+          ## Space-separated list of packages to check whether the selected 
desktop
+          ## is really installed on the system
+          element check_packages { text }? &
+          ## Either install_patterns or install_packages (or both) must be 
defined
+          (
+              ## Optional list of space-separated patterns that should be
+              ## selected for installation
+              element install_patterns { text } |
+              ## Optional list of space-separated packages that should be
+              ## selected for installation
+              element install_packages { text }
+          )+
+        }*
+    }?
+}
+
 ## Software / Package-manager related variables
 software = element software {
     software_elements*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-control-3.1.6/control/control.rng 
new/yast2-installation-control-3.1.8/control/control.rng
--- old/yast2-installation-control-3.1.6/control/control.rng    2014-04-18 
10:42:40.000000000 +0200
+++ new/yast2-installation-control-3.1.8/control/control.rng    2014-05-16 
16:02:46.000000000 +0200
@@ -497,6 +497,8 @@
       <ref name="kernel_packages"/>
       <ref name="packages_transmogrify"/>
       <ref name="default_patterns"/>
+      <ref name="optional_default_patterns"/>
+      <ref name="upgrade"/>
     </choice>
   </define>
   <define name="delete_old_packages">
@@ -772,11 +774,69 @@
     </element>
   </define>
   <define name="default_patterns">
-    <a:documentation>Comma and/or space-separated list of default patterns 
selected for installation</a:documentation>
+    <a:documentation>Space-separated list of default patterns selected for 
installation.
+If such a pattern doesn't exist, error is reported. To omit reporting
+such error, use optional_default_patterns instead.
+These patterns are not selected in auto-installation.</a:documentation>
     <element name="default_patterns">
       <text/>
     </element>
   </define>
+  <define name="optional_default_patterns">
+    <a:documentation>Space-separated list of (optional) default patterns for 
installation.
+These patterns will be selected only if they exist and thus it will
+never report any error if a pattern is not found. Use default_patterns
+for mandatory default patterns.
+These patterns are not selected in auto-installation.</a:documentation>
+    <element name="optional_default_patterns">
+      <text/>
+    </element>
+  </define>
+  <define name="upgrade">
+    <a:documentation>Defines behavior during upgrade</a:documentation>
+    <element name="upgrade">
+      <optional>
+        <element name="window_managers">
+          <a:documentation>Optional list of upgrade paths for default window 
manager set
+in /etc/sysconfig/windowmanager:DEFAULT_WM (not all cases need to be 
handled)</a:documentation>
+          <ref name="LIST"/>
+          <zeroOrMore>
+            <element name="window_manager">
+              <interleave>
+                <element name="sysconfig_wm">
+                  <a:documentation>Windowmanager as found in 
/etc/sysconfig/windowmanager:DEFAULT_WM
+This entry is mandatory</a:documentation>
+                  <text/>
+                </element>
+                <optional>
+                  <element name="check_packages">
+                    <a:documentation>Space-separated list of packages to check 
whether the selected desktop
+is really installed on the system</a:documentation>
+                    <text/>
+                  </element>
+                </optional>
+                <oneOrMore>
+                  <choice>
+                    <a:documentation>Either install_patterns or 
install_packages (or both) must be defined</a:documentation>
+                    <element name="install_patterns">
+                      <a:documentation>Optional list of space-separated 
patterns that should be
+selected for installation</a:documentation>
+                      <text/>
+                    </element>
+                    <element name="install_packages">
+                      <a:documentation>Optional list of space-separated 
packages that should be
+selected for installation</a:documentation>
+                      <text/>
+                    </element>
+                  </choice>
+                </oneOrMore>
+              </interleave>
+            </element>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
   <define name="software">
     <a:documentation>Software / Package-manager related 
variables</a:documentation>
     <element name="software">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-control-3.1.6/package/yast2-installation-control.changes 
new/yast2-installation-control-3.1.8/package/yast2-installation-control.changes
--- 
old/yast2-installation-control-3.1.6/package/yast2-installation-control.changes 
    2014-04-18 10:42:40.000000000 +0200
+++ 
new/yast2-installation-control-3.1.8/package/yast2-installation-control.changes 
    2014-05-16 16:02:46.000000000 +0200
@@ -1,4 +1,19 @@
 -------------------------------------------------------------------
+Fri May 16 15:51:37 CEST 2014 - loci...@suse.com
+
+- Added software->optional_default_patterns - optional patterns
+  selected for installation by default that do not cause reporting
+  an error if they are missing (bnc#876760)
+- 3.1.8
+
+-------------------------------------------------------------------
+Thu May 15 10:40:04 CEST 2014 - loci...@suse.com
+
+- Added software->upgrade->window_managers to handle upgrading
+  the system based on the default windowmanager (bnc#874116)
+- 3.1.7
+
+-------------------------------------------------------------------
 Fri Apr 18 10:17:58 CEST 2014 - loci...@suse.com
 
 - Added software->default_patterns - patterns selected for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-control-3.1.6/package/yast2-installation-control.spec 
new/yast2-installation-control-3.1.8/package/yast2-installation-control.spec
--- 
old/yast2-installation-control-3.1.6/package/yast2-installation-control.spec    
    2014-04-18 10:42:40.000000000 +0200
+++ 
new/yast2-installation-control-3.1.8/package/yast2-installation-control.spec    
    2014-05-16 16:02:46.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation-control
-Version:        3.1.6
+Version:        3.1.8
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

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

Reply via email to