Hello community,
here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2013-05-02 12:08:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old)
and /work/SRC/openSUSE:Factory/.yast2-vm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2013-04-03 13:10:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2013-05-02 12:08:57.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 30 16:56:50 MDT 2013 - carnold@suse.com
+
+- bnc#817790 - SLES11 SP3 - unable to install KVM Hypervisor and
+ tools via YaST2 on s390x
+- 2.22.6
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.22.5.tar.bz2
New:
----
yast2-vm-2.22.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.WXAusQ/_old 2013-05-02 12:08:58.000000000 +0200
+++ /var/tmp/diff_new_pack.WXAusQ/_new 2013-05-02 12:08:58.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-vm
-Version: 2.22.5
+Version: 2.22.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-vm-2.22.5.tar.bz2 -> yast2-vm-2.22.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/MAINTAINER new/yast2-vm-2.22.6/MAINTAINER
--- old/yast2-vm-2.22.5/MAINTAINER 2013-01-22 12:19:53.000000000 +0100
+++ new/yast2-vm-2.22.6/MAINTAINER 2013-04-16 13:56:35.000000000 +0200
@@ -1 +1 @@
-Ladislav Slezak
+Charles Arnold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/Makefile.am new/yast2-vm-2.22.6/Makefile.am
--- old/yast2-vm-2.22.5/Makefile.am 2013-03-26 18:00:09.000000000 +0100
+++ new/yast2-vm-2.22.6/Makefile.am 2013-05-01 19:01:42.000000000 +0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/Makefile.am.common new/yast2-vm-2.22.6/Makefile.am.common
--- old/yast2-vm-2.22.5/Makefile.am.common 2013-03-26 18:00:09.000000000 +0100
+++ new/yast2-vm-2.22.6/Makefile.am.common 2013-05-01 19:01:42.000000000 +0200
@@ -31,7 +31,7 @@
CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/Makefile.in new/yast2-vm-2.22.6/Makefile.in
--- old/yast2-vm-2.22.5/Makefile.in 2013-03-26 18:00:13.000000000 +0100
+++ new/yast2-vm-2.22.6/Makefile.in 2013-05-01 19:01:47.000000000 +0200
@@ -980,19 +980,14 @@
package: check-up-to-date check-tagversion check-textdomain package-local
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/VERSION new/yast2-vm-2.22.6/VERSION
--- old/yast2-vm-2.22.5/VERSION 2013-03-22 22:56:34.000000000 +0100
+++ new/yast2-vm-2.22.6/VERSION 2013-05-01 19:01:35.000000000 +0200
@@ -1 +1 @@
-2.22.5
+2.22.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/configure new/yast2-vm-2.22.6/configure
--- old/yast2-vm-2.22.5/configure 2013-03-26 18:00:13.000000000 +0100
+++ new/yast2-vm-2.22.6/configure 2013-05-01 19:01:46.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-vm 2.22.5.
+# Generated by GNU Autoconf 2.69 for yast2-vm 2.22.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-vm'
PACKAGE_TARNAME='yast2-vm'
-PACKAGE_VERSION='2.22.5'
-PACKAGE_STRING='yast2-vm 2.22.5'
+PACKAGE_VERSION='2.22.6'
+PACKAGE_STRING='yast2-vm 2.22.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,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-vm 2.22.5 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.22.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1318,7 +1318,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-vm 2.22.5:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.22.6:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1398,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-vm configure 2.22.5
+yast2-vm configure 2.22.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1415,7 +1415,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-vm $as_me 2.22.5, which was
+It was created by yast2-vm $as_me 2.22.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2354,7 +2354,7 @@
# Define the identity of the package.
PACKAGE='yast2-vm'
- VERSION='2.22.5'
+ VERSION='2.22.6'
cat >>confdefs.h <<_ACEOF
@@ -2477,9 +2477,9 @@
-VERSION="2.22.5"
+VERSION="2.22.6"
RPMNAME="yast2-vm"
-MAINTAINER="Ladislav Slezak "
+MAINTAINER="Charles Arnold "
pkgconfigdir=\${libdir}/pkgconfig
pkgconfigdatadir=\${datadir}/pkgconfig
@@ -3410,7 +3410,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-vm $as_me 2.22.5, which was
+This file was extended by yast2-vm $as_me 2.22.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3463,7 +3463,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-vm config.status 2.22.5
+yast2-vm config.status 2.22.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/configure.in new/yast2-vm-2.22.6/configure.in
--- old/yast2-vm-2.22.5/configure.in 2013-03-26 18:00:09.000000000 +0100
+++ new/yast2-vm-2.22.6/configure.in 2013-05-01 19:01:42.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-vm
dnl
-dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.22.5, http://bugs.opensuse.org/, yast2-vm)
+AC_INIT(yast2-vm, 2.22.6, http://bugs.opensuse.org/, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,9 +18,9 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.22.5"
+VERSION="2.22.6"
RPMNAME="yast2-vm"
-MAINTAINER="Ladislav Slezak "
+MAINTAINER="Charles Arnold "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/src/Makefile.in new/yast2-vm-2.22.6/src/Makefile.in
--- old/yast2-vm-2.22.5/src/Makefile.in 2013-03-26 18:00:14.000000000 +0100
+++ new/yast2-vm-2.22.6/src/Makefile.in 2013-05-01 19:01:47.000000000 +0200
@@ -609,7 +609,7 @@
dist-hook: check-syntax
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-2.22.5/src/VM_XEN.ycp new/yast2-vm-2.22.6/src/VM_XEN.ycp
--- old/yast2-vm-2.22.5/src/VM_XEN.ycp 2013-03-22 22:56:34.000000000 +0100
+++ new/yast2-vm-2.22.6/src/VM_XEN.ycp 2013-05-01 19:01:35.000000000 +0200
@@ -229,8 +229,8 @@
// package stage
Progress::NextStage();
- // Common packages to both Xen and KVM (hard dependency in libvirt for xen-libs even if kvm only)
- list<string> packages = ["libvirt", "libvirt-python", "xen-libs", "vm-install"];
+ // Common packages to both Xen and KVM
+ list<string> packages = ["libvirt", "libvirt-python", "vm-install"];
if ( install_xen ) {
packages = add(packages, "xen");
@@ -240,6 +240,10 @@
if ( install_kvm ) {
packages = add(packages, "kvm");
}
+ if ( is_s390 == false ) {
+ // There is a hard dependency in libvirt for xen-libs even if kvm only except on s390
+ packages = add(packages, "xen-libs");
+ }
boolean inst_gui = true;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org