Hello community,

here is the log from the commit of package yast2-schema for openSUSE:Factory 
checked in at 2018-12-31 09:41:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-schema (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-schema.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-schema"

Mon Dec 31 09:41:53 2018 rev:42 rq:653568 version:4.0.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-schema/yast2-schema.changes        
2018-11-26 10:29:04.897114160 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-schema.new.28833/yast2-schema.changes     
2018-12-31 09:41:55.318436078 +0100
@@ -1,0 +2,14 @@
+Fri Nov 30 09:20:40 CET 2018 - [email protected]
+
+- Evaluating which package belongs to which schema. This
+  information will be stored in includes.rnc (bsc#1117068)
+- 4.0.6
+
+-------------------------------------------------------------------
+Thu Nov 29 14:23:19 CET 2018 - [email protected]
+
+- yast2-firstboot change: Added firstboot.rnc file to desktop file.
+  (bsc#1117068)
+- 4.0.5
+
+-------------------------------------------------------------------

Old:
----
  yast2-schema-4.0.4.tar.bz2

New:
----
  yast2-schema-4.0.6.tar.bz2

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

Other differences:
------------------
++++++ yast2-schema.spec ++++++
--- /var/tmp/diff_new_pack.IJNjJT/_old  2018-12-31 09:41:55.642435813 +0100
+++ /var/tmp/diff_new_pack.IJNjJT/_new  2018-12-31 09:41:55.646435809 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-schema
-Version:        4.0.4
+Version:        4.0.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -49,7 +49,7 @@
 BuildRequires:  yast2-dhcp-server
 BuildRequires:  yast2-dns-server
 BuildRequires:  yast2-firewall >= 4.0.28
-BuildRequires:  yast2-firstboot
+BuildRequires:  yast2-firstboot >= 4.1.1
 BuildRequires:  yast2-ftp-server
 BuildRequires:  yast2-http-server
 BuildRequires:  yast2-installation

++++++ yast2-schema-4.0.4.tar.bz2 -> yast2-schema-4.0.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-schema-4.0.4/package/yast2-schema.changes 
new/yast2-schema-4.0.6/package/yast2-schema.changes
--- old/yast2-schema-4.0.4/package/yast2-schema.changes 2018-11-22 
16:57:29.000000000 +0100
+++ new/yast2-schema-4.0.6/package/yast2-schema.changes 2018-12-03 
16:23:50.000000000 +0100
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Fri Nov 30 09:20:40 CET 2018 - [email protected]
+
+- Evaluating which package belongs to which schema. This
+  information will be stored in includes.rnc (bsc#1117068)
+- 4.0.6
+
+-------------------------------------------------------------------
+Thu Nov 29 14:23:19 CET 2018 - [email protected]
+
+- yast2-firstboot change: Added firstboot.rnc file to desktop file.
+  (bsc#1117068)
+- 4.0.5
+
+-------------------------------------------------------------------
 Thu Nov 22 16:35:28 CET 2018 - [email protected]
 
 - AutoYaST schema changed in yast2-firewall (4.0.28).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-schema-4.0.4/package/yast2-schema.spec 
new/yast2-schema-4.0.6/package/yast2-schema.spec
--- old/yast2-schema-4.0.4/package/yast2-schema.spec    2018-11-22 
16:57:29.000000000 +0100
+++ new/yast2-schema-4.0.6/package/yast2-schema.spec    2018-12-03 
16:23:50.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-schema
-Version:        4.0.4
+Version:        4.0.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -50,7 +50,7 @@
 BuildRequires: yast2-dhcp-server
 BuildRequires: yast2-dns-server
 BuildRequires: yast2-firewall >= 4.0.28
-BuildRequires: yast2-firstboot
+BuildRequires: yast2-firstboot >= 4.1.1
 BuildRequires: yast2-ftp-server
 BuildRequires: yast2-http-server
 BuildRequires: yast2-installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-schema-4.0.4/scripts/collect.sh 
new/yast2-schema-4.0.6/scripts/collect.sh
--- old/yast2-schema-4.0.4/scripts/collect.sh   2018-11-22 16:57:29.000000000 
+0100
+++ new/yast2-schema-4.0.6/scripts/collect.sh   2018-12-03 16:23:50.000000000 
+0100
@@ -3,7 +3,6 @@
 # Martin Vidner <[email protected]>
 # collect RNC files, create a schema in cwd
 #
-set -o errexit
 
 : ${PREFIX:=/usr}
 SCHEMA_DIR="$PREFIX/share/YaST2/schema/autoyast/rnc"
@@ -31,6 +30,8 @@
     unset X_SuSE_YaST_AutoInstPath
     unset X_SuSE_YaST_AutoInstOptional
 
+    package_name=`/bin/rpm -qf $desktop --qf %{NAME}`
+
     eval $(grep "^X-SuSE-YaST-AutoInst" $desktop | sed -e 
's/X-SuSE-YaST-/X_SuSE_YaST_/' )
 
     if [ -z "$X_SuSE_YaST_AutoInstResource" ]; then
@@ -49,14 +50,14 @@
     if [ "$resource" = "general" ]; then
         resource="general? & pxe"
         cp  $SCHEMA_DIR/pxe.rnc $RNC_OUTPUT
-        echo "include 'pxe.rnc'" >> $RNC_OUTPUT/includes.rnc
+        echo "include 'pxe.rnc' # autoyast2" >> $RNC_OUTPUT/includes.rnc
     fi
 
     if [ ! -z "${X_SuSE_YaST_AutoInstSchema}" ]; then
 
         cp  $SCHEMA_DIR/${X_SuSE_YaST_AutoInstSchema} $RNC_OUTPUT
         
-        echo "include '${X_SuSE_YaST_AutoInstSchema}'" >> 
$RNC_OUTPUT/includes.rnc
+        echo "include '${X_SuSE_YaST_AutoInstSchema}' # $package_name" >> 
$RNC_OUTPUT/includes.rnc
 
         if [ -z "$X_SuSE_YaST_AutoInstOptional" -o 
"$X_SuSE_YaST_AutoInstOptional" = "true" ]; then
            optional="?"


Reply via email to