Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2012-04-17 07:50:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2012-03-20 12:04:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2012-04-17 07:51:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 03 14:56:55 CEST 2012 - [email protected] + +- adapted to move of testX (see bnc#749184) +- 2.22.6 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.22.5.tar.bz2 New: ---- yast2-installation-2.22.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.hgeOEp/_old 2012-04-17 07:51:02.000000000 +0200 +++ /var/tmp/diff_new_pack.hgeOEp/_new 2012-04-17 07:51:02.000000000 +0200 @@ -16,22 +16,29 @@ # - Name: yast2-installation -Version: 2.22.5 +Version: 2.22.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0 Summary: YaST2 - Installation Parts +License: GPL-2.0 +Group: System/YaST Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: libxslt +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite # FileSystems::possible_root_fs BuildRequires: yast2-storage >= 2.19.12 @@ -98,8 +105,9 @@ Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip Requires: coreutils +Requires: gzip +Requires: tar %if 0%{?suse_version} >= 1210 BuildRequires: systemd-devel @@ -129,12 +137,12 @@ BuildArch: noarch %package devel-doc -Group: Documentation/HTML Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq Summary: YaST2 - Installation Parts +Group: Documentation/HTML %description System installation code as present on installation media. @@ -153,7 +161,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works @@ -235,9 +242,6 @@ # programs and scripts %{_prefix}/lib/YaST2/startup -# icewm -/etc/icewm - %dir %{_prefix}/share/doc/packages/yast2-installation %{_prefix}/share/doc/packages/yast2-installation/COPYING %readme %{_prefix}/share/doc/packages/yast2-installation/README ++++++ yast2-installation-2.22.5.tar.bz2 -> yast2-installation-2.22.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/VERSION new/yast2-installation-2.22.6/VERSION --- old/yast2-installation-2.22.5/VERSION 2012-03-16 18:01:09.000000000 +0100 +++ new/yast2-installation-2.22.6/VERSION 2012-04-12 11:06:20.000000000 +0200 @@ -1 +1 @@ -2.22.5 +2.22.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/configure new/yast2-installation-2.22.6/configure --- old/yast2-installation-2.22.5/configure 2012-03-16 18:01:46.000000000 +0100 +++ new/yast2-installation-2.22.6/configure 2012-04-12 11:08:03.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-installation 2.22.5. +# Generated by GNU Autoconf 2.68 for yast2-installation 2.22.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.22.5' -PACKAGE_STRING='yast2-installation 2.22.5' +PACKAGE_VERSION='2.22.6' +PACKAGE_STRING='yast2-installation 2.22.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1240,7 +1240,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.22.5 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.22.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1312,7 +1312,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.22.5:";; + short | recursive ) echo "Configuration of yast2-installation 2.22.6:";; esac cat <<\_ACEOF @@ -1392,7 +1392,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.22.5 +yast2-installation configure 2.22.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1409,7 +1409,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.22.5, which was +It was created by yast2-installation $as_me 2.22.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2339,7 +2339,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.22.5' + VERSION='2.22.6' cat >>confdefs.h <<_ACEOF @@ -2461,7 +2461,7 @@ -VERSION="2.22.5" +VERSION="2.22.6" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <[email protected]>" @@ -3624,7 +3624,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.22.5, which was +This file was extended by yast2-installation $as_me 2.22.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3677,7 +3677,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-installation config.status 2.22.5 +yast2-installation config.status 2.22.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/configure.in new/yast2-installation-2.22.6/configure.in --- old/yast2-installation-2.22.5/configure.in 2012-03-16 18:01:43.000000000 +0100 +++ new/yast2-installation-2.22.6/configure.in 2012-04-12 11:08:00.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.22.5, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.22.6, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.5" +VERSION="2.22.6" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/src/config/Makefile.am new/yast2-installation-2.22.6/src/config/Makefile.am --- old/yast2-installation-2.22.5/src/config/Makefile.am 2009-07-21 16:37:54.000000000 +0200 +++ new/yast2-installation-2.22.6/src/config/Makefile.am 2012-04-02 17:47:37.000000000 +0200 @@ -7,10 +7,6 @@ schemafilesdir = $(schemadir)/autoyast/rnc schemafiles_DATA = $(wildcard *.rnc) -# FIXME -icewmdir= ${sysconfdir}/icewm -icewm_DATA = preferences.yast2 - -EXTRA_DIST = $(desktop_DATA) $(icewm_DATA) $(modconfig_DATA) $(schemafiles_DATA) +EXTRA_DIST = $(desktop_DATA) $(modconfig_DATA) $(schemafiles_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/src/config/Makefile.in new/yast2-installation-2.22.6/src/config/Makefile.in --- old/yast2-installation-2.22.5/src/config/Makefile.in 2012-03-16 18:01:47.000000000 +0100 +++ new/yast2-installation-2.22.6/src/config/Makefile.in 2012-04-12 11:08:04.000000000 +0200 @@ -73,11 +73,11 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icewmdir)" \ +am__installdirs = "$(DESTDIR)$(desktopdir)" \ "$(DESTDIR)$(modconfigdir)" "$(DESTDIR)$(modulebindir)" \ "$(DESTDIR)$(schemafilesdir)" -DATA = $(desktop_DATA) $(icewm_DATA) $(modconfig_DATA) \ - $(modulebin_DATA) $(schemafiles_DATA) +DATA = $(desktop_DATA) $(modconfig_DATA) $(modulebin_DATA) \ + $(schemafiles_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -210,11 +210,7 @@ modconfig_DATA = deploy_image.desktop schemafilesdir = $(schemadir)/autoyast/rnc schemafiles_DATA = $(wildcard *.rnc) - -# FIXME -icewmdir = ${sysconfdir}/icewm -icewm_DATA = preferences.yast2 -EXTRA_DIST = $(desktop_DATA) $(icewm_DATA) $(modconfig_DATA) $(schemafiles_DATA) +EXTRA_DIST = $(desktop_DATA) $(modconfig_DATA) $(schemafiles_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) @@ -281,26 +277,6 @@ test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(desktopdir)" && rm -f $$files -install-icewmDATA: $(icewm_DATA) - @$(NORMAL_INSTALL) - test -z "$(icewmdir)" || $(MKDIR_P) "$(DESTDIR)$(icewmdir)" - @list='$(icewm_DATA)'; test -n "$(icewmdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icewmdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icewmdir)" || exit $$?; \ - done - -uninstall-icewmDATA: - @$(NORMAL_UNINSTALL) - @list='$(icewm_DATA)'; test -n "$(icewmdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(icewmdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(icewmdir)" && rm -f $$files install-modconfigDATA: $(modconfig_DATA) @$(NORMAL_INSTALL) test -z "$(modconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(modconfigdir)" @@ -405,7 +381,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icewmdir)" "$(DESTDIR)$(modconfigdir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(schemafilesdir)"; do \ + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(modconfigdir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(schemafilesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -455,9 +431,8 @@ info-am: -install-data-am: install-desktopDATA install-icewmDATA \ - install-modconfigDATA install-modulebinDATA \ - install-schemafilesDATA +install-data-am: install-desktopDATA install-modconfigDATA \ + install-modulebinDATA install-schemafilesDATA install-dvi: install-dvi-am @@ -501,9 +476,8 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-icewmDATA \ - uninstall-modconfigDATA uninstall-modulebinDATA \ - uninstall-schemafilesDATA +uninstall-am: uninstall-desktopDATA uninstall-modconfigDATA \ + uninstall-modulebinDATA uninstall-schemafilesDATA .MAKE: install-am install-strip @@ -511,15 +485,15 @@ distclean distclean-generic distdir dvi dvi-am html html-am \ info info-am install install-am install-data install-data-am \ install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-icewmDATA \ - install-info install-info-am install-man install-modconfigDATA \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-modconfigDATA \ install-modulebinDATA install-pdf install-pdf-am install-ps \ install-ps-am install-schemafilesDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am uninstall-desktopDATA \ - uninstall-icewmDATA uninstall-modconfigDATA \ - uninstall-modulebinDATA uninstall-schemafilesDATA + uninstall-modconfigDATA uninstall-modulebinDATA \ + uninstall-schemafilesDATA # suffix mapping: info '(make)Static Usage' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/src/config/preferences.yast2 new/yast2-installation-2.22.6/src/config/preferences.yast2 --- old/yast2-installation-2.22.5/src/config/preferences.yast2 2009-07-21 16:37:54.000000000 +0200 +++ new/yast2-installation-2.22.6/src/config/preferences.yast2 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ -# IceWM configuration file for use during installation - -# Hide taskbar -ShowTaskBar=0 - -# Hide titlebar buttons and window menu -TitleButtonsLeft="" -TitleButtonsRight="" -WinMenuItems="" - -# Enable Alt+Tab -QuickSwitch=1 -KeySysSwitchNext="Alt+Tab" -KeySysSwitchLast="Alt+Shift+Tab" - -# Disable Windows key -Win95Keys=0 - -# Colors -ColorActiveTitleBar="rgb:4e/6f/9f" -ColorNormalTitleBar="rgb:c3/c3/c3" - -# Borders -BorderSizeX=3 -BorderSizeY=3 -DlgBorderSizeX=3 -DlgBorderSizeY=3 - -# Disable most shortcuts -# :r !grep -o '\<Key[^=]*' /etc/icewm/preferences | grep -v Switch | sed 's/$/=""/' -KeyWinRaise="" -KeyWinOccupyAll="" -KeyWinLower="" -KeyWinClose="" -KeyWinRestore="" -KeyWinPrev="" -KeyWinNext="" -KeyWinMove="" -KeyWinSize="" -KeyWinMinimize="" -KeyWinMaximize="" -KeyWinMaximizeVert="" -KeyWinMaximizeHoriz="" -KeyWinFullscreen="" -KeyWinHide="" -KeyWinRollup="" -KeyWinMenu="" -KeyWinArrangeN="" -KeyWinArrangeNE="" -KeyWinArrangeE="" -KeyWinArrangeSE="" -KeyWinArrangeS="" -KeyWinArrangeSW="" -KeyWinArrangeW="" -KeyWinArrangeNW="" -KeyWinArrangeC="" -KeySysWinNext="" -KeySysWinPrev="" -KeySysWinMenu="" -KeySysDialog="" -KeySysMenu="" -KeySysWindowList="" -KeySysWinListMenu="" -KeySysAddressBar="" -KeySysWorkspacePrev="" -KeySysWorkspaceNext="" -KeySysWorkspaceLast="" -KeySysWorkspacePrevTakeWin="" -KeySysWorkspaceNextTakeWin="" -KeySysWorkspaceLastTakeWin="" -KeySysWorkspace1="" -KeySysWorkspace2="" -KeySysWorkspace3="" -KeySysWorkspace4="" -KeySysWorkspace5="" -KeySysWorkspace6="" -KeySysWorkspace7="" -KeySysWorkspace8="" -KeySysWorkspace9="" -KeySysWorkspace10="" -KeySysWorkspace11="" -KeySysWorkspace12="" -KeySysWorkspace1TakeWin="" -KeySysWorkspace2TakeWin="" -KeySysWorkspace3TakeWin="" -KeySysWorkspace4TakeWin="" -KeySysWorkspace5TakeWin="" -KeySysWorkspace6TakeWin="" -KeySysWorkspace7TakeWin="" -KeySysWorkspace8TakeWin="" -KeySysWorkspace9TakeWin="" -KeySysWorkspace10TakeWin="" -KeySysWorkspace11TakeWin="" -KeySysWorkspace12TakeWin="" -KeySysTileVertical="" -KeySysTileHorizontal="" -KeySysCascade="" -KeySysArrange="" -KeySysArrangeIcons="" -KeySysMinimizeAll="" -KeySysHideAll="" -KeySysUndoArrange="" -KeySysShowDesktop="" -KeySysCollapseTaskBar="" - -# Disable root window menus -# :r !grep -o '\<Desktop[^=]*Button=' /etc/icewm/preferences | sed 's/$/0/' -DesktopWinMenuButton=0 -DesktopWinListButton=0 -DesktopMenuButton=0 - -# Disable maximize and rollup -TitleBarMaximizeButton=0 -TitleBarRollupButton=0 - -# Disable possibility to move the base window, BNC 466827 -ClientWindowMouseActions=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.5/startup/YaST2.call new/yast2-installation-2.22.6/startup/YaST2.call --- old/yast2-installation-2.22.5/startup/YaST2.call 2012-03-15 10:30:23.000000000 +0100 +++ new/yast2-installation-2.22.6/startup/YaST2.call 2012-04-03 14:57:45.000000000 +0200 @@ -22,7 +22,7 @@ # : which is the same as the NCURSES mode # : - VNC Installation via browser # : -# STATUS : $Id: YaST2.call 67633 2012-03-15 09:30:21Z aschnell $ +# STATUS : $Id: YaST2.call 67853 2012-04-03 12:57:41Z aschnell $ #---------------- # #set -x @@ -39,7 +39,7 @@ # the server is ready for requests using this function # --- server_running=0 - TESTX=/usr/sbin/testX + TESTX=/usr/lib/YaST2/bin/testX while kill -0 $xserver_pid 2>/dev/null ; do sleep 1 if test -e /tmp/.X11-unix/X0 && test -x $TESTX ; then @@ -51,13 +51,6 @@ server_running=0 continue fi - # exit code 2 -> color or dimensions doesn't fit... - if test $err = 2;then - log "\tTestX: color or dimensions doesn't fit" - kill $xserver_pid - server_running=0 - break; - fi # server is running, detach oom-killer from it echo -n '-17' > /proc/$xserver_pid/oom_adj server_running=1 @@ -200,7 +193,7 @@ Y2_MODE=ncurses fi else - /usr/sbin/testX --fast 2>/dev/null + /usr/lib/YaST2/bin/testX --fast 2>/dev/null if test $? = 1;then log "\tCannot access Display: $DISPLAY, falling back to ncurses" SELECTED_MEDIUM="NCURSES" @@ -501,7 +494,7 @@ fi # 3.1.8) Check for testX binary -if [ ! -x /usr/sbin/testX ] ; then +if [ ! -x /usr/lib/YaST2/bin/testX ] ; then log "\tNo testX binary installed -> Medium Qt and Gtk disabled" MEDIUM[0]=0 MEDIUM[4]=0 @@ -532,7 +525,7 @@ MEDIUM[2]=0 fi # 3.3.3) Check for testX binary -if [ ! -x /usr/sbin/testX ] ; then +if [ ! -x /usr/lib/YaST2/bin/testX ] ; then log "\tNo testX binary installed -> Medium VNC disabled" MEDIUM[2]=0 fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
