Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-06-12 18:52:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2016-06-02 12:49:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-06-12 18:52:07.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jun 8 12:13:16 UTC 2016 - lslezak@suse.cz + +- Fixed displaying the file conflicts callbacks when the Progress + dialog is not displayed (bsc#983464) +- 3.1.193 + +------------------------------------------------------------------- +Thu Jun 2 10:29:34 UTC 2016 - igonzalezsosa@suse.com + +- Drop yast2-devel-doc package (fate#320356) +- 3.1.192 + +------------------------------------------------------------------- Old: ---- yast2-3.1.191.tar.bz2 New: ---- yast2-3.1.193.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.MIfT9a/_old 2016-06-12 18:52:08.000000000 +0200 +++ /var/tmp/diff_new_pack.MIfT9a/_new 2016-06-12 18:52:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.191 +Version: 3.1.193 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 @@ -97,21 +97,12 @@ %else Requires: bind-utils %endif +Obsoletes: yast2-devel-doc %description This package contains scripts and data needed for SUSE Linux installation with YaST2 -%package devel-doc -Summary: YaST2 - Development Scripts and Documentation -Group: System/YaST -Requires: yast2 = %{version} -Requires: yast2-core-devel - -%description devel-doc -This package contains scripts and data needed for a SUSE Linux -installation with YaST2. - %prep %setup -q @@ -209,27 +200,4 @@ %{yast_yncludedir}/hwinfo/*.rb %{yast_desktopdir}/messages.desktop -# documentation - -%files devel-doc -%defattr(-,root,root) - -%doc %{yast_docdir}/autodocs -%doc %{yast_docdir}/commandline -%doc %{yast_docdir}/control -%doc %{yast_docdir}/cron -%doc %{yast_docdir}/cwm -%doc %{yast_docdir}/desktop -%doc %{yast_docdir}/gpg -%doc %{yast_docdir}/log -%doc %{yast_docdir}/network -%doc %{yast_docdir}/packages -%doc %{yast_docdir}/runlevel -%doc %{yast_docdir}/sequencer -%doc %{yast_docdir}/system -%doc %{yast_docdir}/types -%doc %{yast_docdir}/wizard -%doc %{yast_docdir}/xml -%doc %{yast_docdir}/general - %changelog ++++++ yast2-3.1.191.tar.bz2 -> yast2-3.1.193.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/doc/Makefile.am new/yast2-3.1.193/doc/Makefile.am --- old/yast2-3.1.191/doc/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/doc/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,10 +2,6 @@ # Makefile.am for y2c_network/doc # -SUBDIRS = autodocs examples screenshots - -htmldir = $(docdir) - doc_DATA = html_DATA = man_MANS = yast2.8 yast.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/doc/autodocs/Makefile.am new/yast2-3.1.193/doc/autodocs/Makefile.am --- old/yast2-3.1.191/doc/autodocs/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_PM = $(wildcard $(srcdir)/../../library/general/src/modules/*.pm) -AUTODOCS_RB = $(wildcard $(srcdir)/../../library/general/src/modules/*.rb) - -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/commandline/Makefile.am new/yast2-3.1.193/library/commandline/Makefile.am --- old/yast2-3.1.191/library/commandline/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/commandline/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for yast2/library/commandline # -SUBDIRS = doc src testsuite test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/commandline/doc/Makefile.am new/yast2-3.1.193/library/commandline/doc/Makefile.am --- old/yast2-3.1.191/library/commandline/doc/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/commandline/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/commandline - -html_DATA = CommandLine.txt lan-simple.ycp lan-simpler.ycp - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/commandline/doc/autodocs/Makefile.am new/yast2-3.1.193/library/commandline/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/commandline/doc/autodocs/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/commandline/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=commandline -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/control/Makefile.am new/yast2-3.1.193/library/control/Makefile.am --- old/yast2-3.1.191/library/control/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/control/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for xml/module # -SUBDIRS = doc src test testsuite +SUBDIRS = src test testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/control/doc/Makefile.am new/yast2-3.1.193/library/control/doc/Makefile.am --- old/yast2-3.1.191/library/control/doc/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/control/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# Makefile.am for xml/module/doc -# - -SUBDIRS = autodocs - -htmldir = $(docdir) - -doc_DATA = -html_DATA = - -EXTRA_DIST = $(doc_DATA) $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/control/doc/autodocs/Makefile.am new/yast2-3.1.193/library/control/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/control/doc/autodocs/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/control/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=control -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/control/src/modules/ProductProfile.rb new/yast2-3.1.193/library/control/src/modules/ProductProfile.rb --- old/yast2-3.1.191/library/control/src/modules/ProductProfile.rb 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/control/src/modules/ProductProfile.rb 2016-06-09 17:30:26.000000000 +0200 @@ -160,7 +160,7 @@ # YaPI::SubscriptionTools are only available for SLES Yast.import "YaPI::SubscriptionTools" rescue NameError - y2milestone("subscription-tools package not present: no compliance checking") + Builtins.y2milestone("subscription-tools package not present: no compliance checking") return true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/cron/Makefile.am new/yast2-3.1.193/library/cron/Makefile.am --- old/yast2-3.1.191/library/cron/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/cron/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # # Makefile.am for yast2/library/cron -SUBDIRS = src doc +SUBDIRS = src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/cron/doc/Makefile.am new/yast2-3.1.193/library/cron/doc/Makefile.am --- old/yast2-3.1.191/library/cron/doc/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/cron/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/cron - -html_DATA = - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/cron/doc/autodocs/Makefile.am new/yast2-3.1.193/library/cron/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/cron/doc/autodocs/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/cron/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=cron -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/cwm/Makefile.am new/yast2-3.1.193/library/cwm/Makefile.am --- old/yast2-3.1.191/library/cwm/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/cwm/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # # Makefile.am for yast2/sequencer -SUBDIRS = doc src testsuite test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/cwm/doc/Makefile.am new/yast2-3.1.193/library/cwm/doc/Makefile.am --- old/yast2-3.1.191/library/cwm/doc/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/cwm/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -# Makefile.am for YCP module .../doc - -include ${srcdir}/docbook-docbook-toys.ami - -SUBDIRS = autodocs - -htmldir = $(docdir)/cwm - -html_DATA = # cwm.html - -EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami - -DOCBOOK_MAIN = cwm.xml -DOCBOOK_FILES = $(wildcard *.xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/cwm/doc/autodocs/Makefile.am new/yast2-3.1.193/library/cwm/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/cwm/doc/autodocs/Makefile.am 2016-06-01 14:31:48.000000000 +0200 +++ new/yast2-3.1.193/library/cwm/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=cwm -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/desktop/Makefile.am new/yast2-3.1.193/library/desktop/Makefile.am --- old/yast2-3.1.191/library/desktop/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/desktop/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # Makefile.am for yast2/library/desktop -SUBDIRS = doc groups src +SUBDIRS = groups src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/desktop/doc/Makefile.am new/yast2-3.1.193/library/desktop/doc/Makefile.am --- old/yast2-3.1.191/library/desktop/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/desktop/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/desktop - -html_DATA = - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/desktop/doc/autodocs/Makefile.am new/yast2-3.1.193/library/desktop/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/desktop/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/desktop/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=desktop -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/general/Makefile.am new/yast2-3.1.193/library/general/Makefile.am --- old/yast2-3.1.191/library/general/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/general/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # Makefile.am for library/general -SUBDIRS = src testsuite test hooks doc +SUBDIRS = src testsuite test hooks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/general/doc/Makefile.am new/yast2-3.1.193/library/general/doc/Makefile.am --- old/yast2-3.1.191/library/general/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/general/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# Makefile.am for ../doc - -generaldir = $(docdir)/general - -general_DATA = $(wildcard *.md) - -EXTRA_DIST = $(general_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/gpg/Makefile.am new/yast2-3.1.193/library/gpg/Makefile.am --- old/yast2-3.1.191/library/gpg/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/gpg/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for yast2/gpg # -SUBDIRS = doc src +SUBDIRS = src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/gpg/doc/Makefile.am new/yast2-3.1.193/library/gpg/doc/Makefile.am --- old/yast2-3.1.191/library/gpg/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/gpg/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/gpg -html_DATA = example.rb - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/gpg/doc/autodocs/Makefile.am new/yast2-3.1.193/library/gpg/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/gpg/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/gpg/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=gpg -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/log/Makefile.am new/yast2-3.1.193/library/log/Makefile.am --- old/yast2-3.1.191/library/log/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/log/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # # Makefile.am for yast2/sequencer -SUBDIRS = doc src +SUBDIRS = src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/log/doc/Makefile.am new/yast2-3.1.193/library/log/doc/Makefile.am --- old/yast2-3.1.191/library/log/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/log/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/log - -html_DATA = - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/log/doc/autodocs/Makefile.am new/yast2-3.1.193/library/log/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/log/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/log/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=log -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/network/Makefile.am new/yast2-3.1.193/library/network/Makefile.am --- old/yast2-3.1.191/library/network/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/network/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for yast2/library/network # -SUBDIRS = doc src testsuite test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/network/doc/Makefile.am new/yast2-3.1.193/library/network/doc/Makefile.am --- old/yast2-3.1.191/library/network/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/network/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -#htmldir = $(docdir)/network - -#html_DATA = - -#EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/network/doc/autodocs/Makefile.am new/yast2-3.1.193/library/network/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/network/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/network/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -# Include the FirewallD API in the autodocs -AUTODOCS_RB = $(wildcard $(srcdir)/../../src/modules/*.rb \ - $(srcdir)/../../src/include/*/*.rb \ - $(srcdir)/../../src/lib/*/*.rb) - -AUTODOCS_SUBDIR=network -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/packages/Makefile.am new/yast2-3.1.193/library/packages/Makefile.am --- old/yast2-3.1.191/library/packages/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/packages/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # Makefile.am for yast2/library/packages -SUBDIRS = src testsuite doc test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/packages/doc/Makefile.am new/yast2-3.1.193/library/packages/doc/Makefile.am --- old/yast2-3.1.191/library/packages/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/packages/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -# Makefile.am for .../doc - -SUBDIRS = autodocs - -htmldir = @docdir@/packages - -html_DATA = $(wildcard *.html *.txt) -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/packages/doc/autodocs/Makefile.am new/yast2-3.1.193/library/packages/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/packages/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/packages/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=packages -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/packages/src/lib/packages/file_conflict_callbacks.rb new/yast2-3.1.193/library/packages/src/lib/packages/file_conflict_callbacks.rb --- old/yast2-3.1.191/library/packages/src/lib/packages/file_conflict_callbacks.rb 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/packages/src/lib/packages/file_conflict_callbacks.rb 2016-06-09 17:30:26.000000000 +0200 @@ -37,6 +37,7 @@ Yast.import "Report" Yast.import "Label" Yast.import "PackageCallbacks" + Yast.import "Wizard" textdomain "base" @@ -83,6 +84,7 @@ Yast::UI.ChangeWidget(Id(PKG_INSTALL_WIDGET), :Value, 0) Yast::UI.ChangeWidget(Id(PKG_INSTALL_WIDGET), :Label, label) else + Yast::Wizard.CreateDialog # TRANSLATORS: help text for the file conflict detection progress help = _("<p>Detecting the file conflicts is in progress.</p>") # Use the same label for the window title and the progressbar label @@ -148,10 +150,11 @@ # Handle the file conflict detection finish callback. def finish log.info "File conflict check finished" - return if Yast::Mode.commandline + return if Yast::Mode.commandline || pkg_installation? # finish the opened progress dialog - Yast::Progress.Finish unless pkg_installation? + Yast::Progress.Finish + Yast::Wizard.CloseDialog end # Construct the file conflicts dialog. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/packages/test/file_conflict_callbacks_test.rb new/yast2-3.1.193/library/packages/test/file_conflict_callbacks_test.rb --- old/yast2-3.1.191/library/packages/test/file_conflict_callbacks_test.rb 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/packages/test/file_conflict_callbacks_test.rb 2016-06-09 17:30:26.000000000 +0200 @@ -80,6 +80,7 @@ it "opens a new progress if installation progress was not displayed" do expect(Yast::UI).to receive(:WidgetExists).and_return(false) + expect(Yast::Wizard).to receive(:CreateDialog) expect(Yast::Progress).to receive(:Simple) start_cb.call @@ -287,7 +288,8 @@ end it "closes progress if installation progress was not displayed" do - expect(Yast::UI).to receive(:WidgetExists).and_return(false) + allow(Yast::UI).to receive(:WidgetExists).and_return(false) + expect(Yast::Wizard).to receive(:CloseDialog) expect(Yast::Progress).to receive(:Finish) finish_cb.call diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/runlevel/Makefile.am new/yast2-3.1.193/library/runlevel/Makefile.am --- old/yast2-3.1.191/library/runlevel/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/runlevel/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # # Makefile.am for yast2/runlevel -SUBDIRS = doc src testsuite test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/runlevel/doc/Makefile.am new/yast2-3.1.193/library/runlevel/doc/Makefile.am --- old/yast2-3.1.191/library/runlevel/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/runlevel/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/runlevel - -html_DATA = $(wildcard *.html *.txt) - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/runlevel/doc/autodocs/Makefile.am new/yast2-3.1.193/library/runlevel/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/runlevel/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/runlevel/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=runlevel -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/sequencer/Makefile.am new/yast2-3.1.193/library/sequencer/Makefile.am --- old/yast2-3.1.191/library/sequencer/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/sequencer/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # Makefile.am for yast2/library/sequencer -SUBDIRS = doc src testsuite +SUBDIRS = src testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/sequencer/doc/Makefile.am new/yast2-3.1.193/library/sequencer/doc/Makefile.am --- old/yast2-3.1.191/library/sequencer/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/sequencer/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -# Makefile.am for .../doc - -SUBDIRS = autodocs images examples - -htmldir = @docdir@/sequencer - -html_DATA = $(wildcard *.html *.txt) -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/sequencer/doc/autodocs/Makefile.am new/yast2-3.1.193/library/sequencer/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/sequencer/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/sequencer/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=sequencer -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/system/Makefile.am new/yast2-3.1.193/library/system/Makefile.am --- old/yast2-3.1.191/library/system/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/system/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -1,3 +1,3 @@ # Makefile.am for yast2/library/system -SUBDIRS = doc src testsuite test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/system/doc/Makefile.am new/yast2-3.1.193/library/system/doc/Makefile.am --- old/yast2-3.1.191/library/system/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/system/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# Makefile.am for YCP module .../doc - -SUBDIRS = autodocs - -htmldir = $(docdir)/system - -html_DATA = - -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/system/doc/autodocs/Makefile.am new/yast2-3.1.193/library/system/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/system/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/system/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=system -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/types/Makefile.am new/yast2-3.1.193/library/types/Makefile.am --- old/yast2-3.1.191/library/types/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/types/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for yast2/library/types # -SUBDIRS = src testsuite doc test +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/types/doc/Makefile.am new/yast2-3.1.193/library/types/doc/Makefile.am --- old/yast2-3.1.191/library/types/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/types/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -# Makefile.am for .../doc - -SUBDIRS = autodocs - -htmldir = @docdir@/types - -html_DATA = $(wildcard *.html *.txt) -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/types/doc/autodocs/Makefile.am new/yast2-3.1.193/library/types/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/types/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/types/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=types -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/wizard/Makefile.am new/yast2-3.1.193/library/wizard/Makefile.am --- old/yast2-3.1.191/library/wizard/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/wizard/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for yast2/wizard # -SUBDIRS = doc src testsuite +SUBDIRS = src testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/wizard/doc/Makefile.am new/yast2-3.1.193/library/wizard/doc/Makefile.am --- old/yast2-3.1.191/library/wizard/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/wizard/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -# -# Makefile.am for yast2/library/wizard/doc -# - -SUBDIRS = autodocs examples screenshots - -docdir = @docdir@/wizard -htmldir = $(docdir) - -html_DATA = $(wildcard *.html README*) -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/wizard/doc/autodocs/Makefile.am new/yast2-3.1.193/library/wizard/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/wizard/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/wizard/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=wizard -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/xml/Makefile.am new/yast2-3.1.193/library/xml/Makefile.am --- old/yast2-3.1.191/library/xml/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/xml/Makefile.am 2016-06-09 17:30:26.000000000 +0200 @@ -2,4 +2,4 @@ # Makefile.am for xml/module # -SUBDIRS = doc src +SUBDIRS = src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/xml/doc/Makefile.am new/yast2-3.1.193/library/xml/doc/Makefile.am --- old/yast2-3.1.191/library/xml/doc/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/xml/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# Makefile.am for xml/module/doc -# - -SUBDIRS = autodocs - -htmldir = $(docdir) - -doc_DATA = -html_DATA = - -EXTRA_DIST = $(doc_DATA) $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/library/xml/doc/autodocs/Makefile.am new/yast2-3.1.193/library/xml/doc/autodocs/Makefile.am --- old/yast2-3.1.191/library/xml/doc/autodocs/Makefile.am 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/library/xml/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Makefile.am for YCP module .../doc/autodocs - -AUTODOCS_SUBDIR=xml -include $(top_srcdir)/autodocs-ycp.ami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/package/yast2.changes new/yast2-3.1.193/package/yast2.changes --- old/yast2-3.1.191/package/yast2.changes 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/package/yast2.changes 2016-06-09 17:30:26.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Jun 8 12:13:16 UTC 2016 - lslezak@suse.cz + +- Fixed displaying the file conflicts callbacks when the Progress + dialog is not displayed (bsc#983464) +- 3.1.193 + +------------------------------------------------------------------- +Thu Jun 2 10:29:34 UTC 2016 - igonzalezsosa@suse.com + +- Drop yast2-devel-doc package (fate#320356) +- 3.1.192 + +------------------------------------------------------------------- Fri May 20 08:09:04 UTC 2016 - mchandras@suse.de - Split SuSEFirewall and SuSEFirewallServices classes to separate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.191/package/yast2.spec new/yast2-3.1.193/package/yast2.spec --- old/yast2-3.1.191/package/yast2.spec 2016-06-01 14:31:49.000000000 +0200 +++ new/yast2-3.1.193/package/yast2.spec 2016-06-09 17:30:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.191 +Version: 3.1.193 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 @@ -97,21 +97,12 @@ %else Requires: bind-utils %endif +Obsoletes: yast2-devel-doc %description This package contains scripts and data needed for SUSE Linux installation with YaST2 -%package devel-doc -Summary: YaST2 - Development Scripts and Documentation -Group: System/YaST -Requires: yast2 = %{version} -Requires: yast2-core-devel - -%description devel-doc -This package contains scripts and data needed for a SUSE Linux -installation with YaST2. - %prep %setup -q @@ -209,27 +200,4 @@ %{yast_yncludedir}/hwinfo/*.rb %{yast_desktopdir}/messages.desktop -# documentation - -%files devel-doc -%defattr(-,root,root) - -%doc %{yast_docdir}/autodocs -%doc %{yast_docdir}/commandline -%doc %{yast_docdir}/control -%doc %{yast_docdir}/cron -%doc %{yast_docdir}/cwm -%doc %{yast_docdir}/desktop -%doc %{yast_docdir}/gpg -%doc %{yast_docdir}/log -%doc %{yast_docdir}/network -%doc %{yast_docdir}/packages -%doc %{yast_docdir}/runlevel -%doc %{yast_docdir}/sequencer -%doc %{yast_docdir}/system -%doc %{yast_docdir}/types -%doc %{yast_docdir}/wizard -%doc %{yast_docdir}/xml -%doc %{yast_docdir}/general - %changelog