Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Tue Apr 13 22:36:04 CEST 2010.
--------
--- yast2-installation/yast2-installation.changes 2010-03-26 11:28:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2010-04-09 18:19:11.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Apr 09 17:09:27 CEST 2010 - aschnell@suse.de
+
+- disable Qt/Gtk frontend if testX is unavailable (bnc #585432)
+- 2.19.5
+
+-------------------------------------------------------------------
+Tue Apr 6 17:44:25 CEST 2010 - locilka@suse.cz
+
+- Searching for LiveCD license in /usr/share/doc/licenses and /
+ directories (BNC #594042).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.19.4.tar.bz2
New:
----
yast2-installation-2.19.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.UHNvu2/_old 2010-04-13 22:35:34.000000000 +0200
+++ /var/tmp/diff_new_pack.UHNvu2/_new 2010-04-13 22:35:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.19.4)
+# spec file for package yast2-installation (Version 2.19.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-installation
-Version: 2.19.4
+Version: 2.19.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.19.4.tar.bz2
+Source0: yast2-installation-2.19.5.tar.bz2
Prefix: /usr
@@ -133,7 +133,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.19.4
+%setup -n yast2-installation-2.19.5
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.19.4.tar.bz2 -> yast2-installation-2.19.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.4/VERSION new/yast2-installation-2.19.5/VERSION
--- old/yast2-installation-2.19.4/VERSION 2010-03-26 11:25:44.000000000 +0100
+++ new/yast2-installation-2.19.5/VERSION 2010-04-09 18:17:05.000000000 +0200
@@ -1 +1 @@
-2.19.4
+2.19.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.4/configure new/yast2-installation-2.19.5/configure
--- old/yast2-installation-2.19.4/configure 2010-03-26 11:27:04.000000000 +0100
+++ new/yast2-installation-2.19.5/configure 2010-04-09 18:17:24.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-installation 2.19.4.
+# Generated by GNU Autoconf 2.63 for yast2-installation 2.19.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.19.4'
-PACKAGE_STRING='yast2-installation 2.19.4'
+PACKAGE_VERSION='2.19.5'
+PACKAGE_STRING='yast2-installation 2.19.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1285,7 +1285,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.19.4 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.19.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.19.4:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.19.5:";;
esac
cat <<\_ACEOF
@@ -1437,7 +1437,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.19.4
+yast2-installation configure 2.19.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1451,7 +1451,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.19.4, which was
+It was created by yast2-installation $as_me 2.19.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2431,7 +2431,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.19.4'
+ VERSION='2.19.5'
cat >>confdefs.h <<_ACEOF
@@ -2553,7 +2553,7 @@
-VERSION="2.19.4"
+VERSION="2.19.5"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3743,7 +3743,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.19.4, which was
+This file was extended by yast2-installation $as_me 2.19.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3793,7 +3793,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-installation config.status 2.19.4
+yast2-installation config.status 2.19.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.4/configure.in new/yast2-installation-2.19.5/configure.in
--- old/yast2-installation-2.19.4/configure.in 2010-03-26 11:27:01.000000000 +0100
+++ new/yast2-installation-2.19.5/configure.in 2010-04-09 18:17:21.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.19.4, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.19.5, 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.19.4"
+VERSION="2.19.5"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.4/src/inst_finish/copy_files_finish.ycp new/yast2-installation-2.19.5/src/inst_finish/copy_files_finish.ycp
--- old/yast2-installation-2.19.4/src/inst_finish/copy_files_finish.ycp 2009-04-07 11:29:42.000000000 +0200
+++ new/yast2-installation-2.19.5/src/inst_finish/copy_files_finish.ycp 2010-04-07 10:30:17.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: copy_files_finish.ycp 56211 2009-03-18 12:32:08Z locilka $
+ * $Id: copy_files_finish.ycp 61595 2010-04-07 08:22:43Z locilka $
*
*/
@@ -191,21 +191,31 @@
y2milestone ("Using license dir: %1", license_dir);
}
- string license_file = "/license.tar.gz";
- // Copy licenses so it can be used in firstboot later
- // bnc #396976
- map cmd = (map) WFM::Execute (.local.bash_output,
- sformat (
- "mkdir -p '%1' && cd '%1' && rm -rf license*.txt; tar -xf '%2'",
- String::Quote (license_dir),
- String::Quote (license_file)
- )
- );
- if (cmd["exit"]:-1 == 0) {
- y2milestone ("Copying %1 to %2 was successful", license_file, license_dir);
- } else {
- y2error ("Copying %1 to %2 has failed: %3", license_file, license_dir, cmd);
- }
+ // BNC #594042: Multiple license locations
+ list <string> license_locations = ["/usr/share/doc/licenses/", "/"];
+
+ foreach (string license_location, license_locations, {
+ license_location = sformat ("%1/license.tar.gz", license_location);
+
+ if (! FileUtils::Exists (license_location)) return;
+
+ // Copy licenses so it can be used in firstboot later
+ // bnc #396976
+ map cmd = (map) WFM::Execute (.local.bash_output,
+ sformat (
+ "mkdir -p '%1' && cd '%1' && rm -rf license*.*; cd '%1' && tar -xf '%2'",
+ String::Quote (license_dir),
+ String::Quote (license_location)
+ )
+ );
+ if (cmd["exit"]:-1 == 0) {
+ y2milestone ("Copying %1 to %2 was successful", license_location, license_dir);
+ } else {
+ y2error ("Copying %1 to %2 has failed: %3", license_location, license_dir, cmd);
+ }
+
+ break;
+ });
// bugzila #328126
// Copy 70-persistent-cd.rules ... if not updating
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.4/startup/YaST2.call new/yast2-installation-2.19.5/startup/YaST2.call
--- old/yast2-installation-2.19.4/startup/YaST2.call 2009-10-09 13:21:51.000000000 +0200
+++ new/yast2-installation-2.19.5/startup/YaST2.call 2010-04-09 17:11:30.000000000 +0200
@@ -22,7 +22,7 @@
# : which is the same as the NCURSES mode
# : - VNC Installation via browser
# :
-# STATUS : $Id: YaST2.call 58417 2009-08-21 10:46:27Z aschnell $
+# STATUS : $Id: YaST2.call 61636 2010-04-09 15:11:29Z aschnell $
#----------------
#
#set -x
@@ -450,7 +450,7 @@
MEDIUM=(1 1 1 1 1)
#=============================================
-# 3.1) prequalification checks for Qt
+# 3.1) prequalification checks for Qt and Gtk
#---------------------------------------------
log "Starting prequalification checks..."
log "==================================="
@@ -498,6 +498,13 @@
MEDIUM[4]=1
fi
+# 3.1.8) Check for testX binary
+if [ ! -x /usr/sbin/testX ] ; then
+ log "\tNo testX binary installed -> Medium Qt and Gtk disabled"
+ MEDIUM[0]=0
+ MEDIUM[4]=0
+fi
+
#=============================================
# 3.2) prequalification checks for SSH
#---------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org