Hello community,
here is the log from the commit of package yast2-vm
checked in at Wed May 24 03:03:32 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-05-19 12:34:21.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-05-23 19:56:29.000000000 +0200
@@ -1,0 +2,7 @@
+Mon May 22 15:30:40 MDT 2006 - mgfritch@novell.com
+
+- Allow the cdrom_image setting to persist when moving from
+ proposal_type 'install' to proposal_type 'boot'. (#174616)
+- 2.13.52
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.51.tar.bz2
New:
----
yast2-vm-2.13.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.yxAuKW/_old 2006-05-24 03:02:17.000000000 +0200
+++ /var/tmp/diff_new_pack.yxAuKW/_new 2006-05-24 03:02:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.51)
+# spec file for package yast2-vm (Version 2.13.52)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.13.51
+Version: 2.13.52
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.51.tar.bz2
+Source0: yast2-vm-2.13.52.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak
%prep
-%setup -n yast2-vm-2.13.51
+%setup -n yast2-vm-2.13.52
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Mon May 22 2006 - mgfritch@novell.com
+- Allow the cdrom_image setting to persist when moving from
+ proposal_type 'install' to proposal_type 'boot'. (#174616)
+- 2.13.52
* Fri May 19 2006 - lslezak@suse.cz
- allow the VM management in ncurses UI (#149045)
- 2.13.51
++++++ yast2-vm-2.13.51.tar.bz2 -> yast2-vm-2.13.52.tar.bz2 ++++++
++++ 3154 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.51/Makefile.am new/yast2-vm-2.13.52/Makefile.am
--- old/yast2-vm-2.13.51/Makefile.am 2006-05-19 12:24:49.000000000 +0200
+++ new/yast2-vm-2.13.52/Makefile.am 2006-05-23 17:00:32.000000000 +0200
@@ -6,9 +6,7 @@
# (Edit ./SUBDIRS instead)
#
-#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+PREFIX = /usr
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -32,10 +30,6 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
-# where devtools instal m4 snippets
-# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
@@ -63,8 +57,12 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
+# pkg-config
+# if a package does not have its own pc, copy the generic one
+$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
+ test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here (not anymore!)
+# because the prerequisite is made here
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
$(RPMNAME).pc: $(RPMNAME).pc.in
@@ -96,7 +94,7 @@
done
pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -117,7 +115,7 @@
fi
spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -144,20 +142,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
-TAGVERSION = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,13 +198,10 @@
false; \
fi
-check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable
# For po/ modules
@@ -215,4 +210,4 @@
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents control doc src testsuite
+SUBDIRS = agents control doc src
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.51/Makefile.am.common new/yast2-vm-2.13.52/Makefile.am.common
--- old/yast2-vm-2.13.51/Makefile.am.common 2006-05-19 12:24:49.000000000 +0200
+++ new/yast2-vm-2.13.52/Makefile.am.common 2006-05-23 17:00:32.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.51/VERSION new/yast2-vm-2.13.52/VERSION
--- old/yast2-vm-2.13.51/VERSION 2006-05-19 11:12:28.000000000 +0200
+++ new/yast2-vm-2.13.52/VERSION 2006-05-22 23:34:56.000000000 +0200
@@ -1 +1 @@
-2.13.51
+2.13.52
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.51/configure.in new/yast2-vm-2.13.52/configure.in
--- old/yast2-vm-2.13.51/configure.in 2006-05-19 12:24:48.000000000 +0200
+++ new/yast2-vm-2.13.52/configure.in 2006-05-23 17:00:32.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-vm
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.13.51, http://bugs.opensuse.org/, yast2-vm)
+AC_INIT(yast2-vm, 2.13.52, http://www.suse.de/feedback, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.51"
+VERSION="2.13.52"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
@@ -110,8 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -138,10 +138,6 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
-AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
-if test "$YCPC" = "false"; then
- AC_MSG_ERROR([ycpc is not installed])
-fi
( cd control;
@@ -155,8 +151,7 @@
control/Makefile
doc/autodocs/Makefile
doc/Makefile
-src/Makefile
-testsuite/Makefile)
+src/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.51/src/VM_XEN.ycp new/yast2-vm-2.13.52/src/VM_XEN.ycp
--- old/yast2-vm-2.13.51/src/VM_XEN.ycp 2006-05-19 10:51:46.000000000 +0200
+++ new/yast2-vm-2.13.52/src/VM_XEN.ycp 2006-05-23 19:55:23.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 31030 2006-05-18 21:59:22Z mgfritch $
+ * $Id: VM_XEN.ycp 31118 2006-05-23 17:55:16Z mgfritch $
*/
{
module "VM_XEN";
@@ -793,7 +793,9 @@
}
else {
boot_device = "c";
- cdrom_image = default_cdrom_image;
+ if (VM_Common::proposal_type != "boot") {// allow the cdrom_image setting to persist when moving from proposal_type 'install' to proposal_type 'boot'. See bugzilla #174616.
+ cdrom_image = default_cdrom_image;
+ }
}
VM_Common::SetKernelImage("/usr/lib/xen/boot/hvmloader");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.51/testsuite/Makefile.am new/yast2-vm-2.13.52/testsuite/Makefile.am
--- old/yast2-vm-2.13.51/testsuite/Makefile.am 2005-01-21 18:45:40.000000000 +0100
+++ new/yast2-vm-2.13.52/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#
-# Makefile.am for .../testsuite
-#
-# Do not edit this file (Makefile.am) as it will be overwritten!
-#
-
-AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
-
-testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
-
-all-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
-
-clean-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
-
-check-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
-
-# EOF
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...