commit yast2-vm

19 May 2006

Hello community,

here is the log from the commit of package yast2-vm
checked in at Fri May 19 17:01:36 CEST 2006.

--------

--- yast2-vm/yast2-vm.changes	2006-05-19 00:01:21.000000000 +0200
+++ yast2-vm/yast2-vm.changes	2006-05-19 12:34:21.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May 19 11:12:34 CEST 2006 - lslezak@suse.cz
+
+- allow the VM management in ncurses UI (#149045)
+- 2.13.51
+
+-------------------------------------------------------------------

Old:
----
  yast2-vm-2.13.50.tar.bz2

New:
----
  yast2-vm-2.13.51.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.h5NadM/_old	2006-05-19 17:01:26.000000000 +0200
+++ /var/tmp/diff_new_pack.h5NadM/_new	2006-05-19 17:01:26.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-vm (Version 2.13.50)
+# spec file for package yast2-vm (Version 2.13.51)
 #
 # 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.50
+Version:        2.13.51
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-vm-2.13.50.tar.bz2
+Source0:        yast2-vm-2.13.51.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 <lslezak@suse.cz>
 
 %prep
-%setup -n yast2-vm-2.13.50
+%setup -n yast2-vm-2.13.51
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,9 @@
 %doc %{prefix}/share/doc/packages/yast2-vm
 
 %changelog -n yast2-vm
+* Fri May 19 2006 - lslezak@suse.cz
+- allow the VM management in ncurses UI (#149045)
+- 2.13.51
 * Thu May 18 2006 - mgfritch@novell.com
 - Do not install kernel-xen when installing kernel-xenpae.
   (#175117)

++++++ yast2-vm-2.13.50.tar.bz2 -> yast2-vm-2.13.51.tar.bz2 ++++++
++++    3175 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.50/Makefile.am new/yast2-vm-2.13.51/Makefile.am
--- old/yast2-vm-2.13.50/Makefile.am	2006-05-18 17:51:04.000000000 +0200
+++ new/yast2-vm-2.13.51/Makefile.am	2006-05-19 12:24:49.000000000 +0200
@@ -6,7 +6,9 @@
 #    (Edit ./SUBDIRS instead)
 #
 
-PREFIX			= /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +32,10 @@
 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 $< $@
@@ -57,12 +63,8 @@
 
 # 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
+# because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
 $(RPMNAME).pc: $(RPMNAME).pc.in
@@ -94,7 +96,7 @@
 	done
 
 pot:
-	y2tool y2makepot -s $(srcdir)
+	$(Y2TOOL) y2makepot -s $(srcdir)
 
 install-pot: pot
 	@POT_DST=`find -type d -name testsuite -prune , \
@@ -115,7 +117,7 @@
 	fi
 
 spellcheck: pot
-	y2tool pot-spellcheck
+	$(Y2TOOL) pot-spellcheck
 
 # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
 
@@ -142,20 +144,20 @@
 	rm -f package/*.bak
 	rm -f package/*.auto
 	mv $(RPMNAME)-$(VERSION).tar.bz2 package/
-	if ! test -x $(PREFIX)/bin/y2tool; then \
-	    echo "$(PREFIX)/bin/y2tool: not found."; \
+	if ! test -x $(Y2TOOL); then \
+	    echo "$(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"`"; \
-	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+	    $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
 
-TAGVERSION	 = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION	 = $(Y2TOOL) tagversion
 
 check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
 	if [ -d $(srcdir)/CVS ]; then \
@@ -198,10 +200,13 @@
 		false;							\
 	fi
 
+check-textdomain:
+	$(Y2TOOL) check-textdomain $(srcdir)
+
 stable: checkin-stable
 
 checkin-stable: package
-	$(PREFIX)/bin/y2tool checkin-stable
+	$(Y2TOOL) checkin-stable
 
 
 # For po/ modules
@@ -210,4 +215,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 
+SUBDIRS = agents control doc src testsuite 
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.50/Makefile.am.common new/yast2-vm-2.13.51/Makefile.am.common
--- old/yast2-vm-2.13.50/Makefile.am.common	2006-05-18 17:51:04.000000000 +0200
+++ new/yast2-vm-2.13.51/Makefile.am.common	2006-05-19 12:24:49.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) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+	Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${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.50/VERSION new/yast2-vm-2.13.51/VERSION
--- old/yast2-vm-2.13.50/VERSION	2006-05-18 23:57:22.000000000 +0200
+++ new/yast2-vm-2.13.51/VERSION	2006-05-19 11:12:28.000000000 +0200
@@ -1 +1 @@
-2.13.50
+2.13.51
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.50/configure.in new/yast2-vm-2.13.51/configure.in
--- old/yast2-vm-2.13.50/configure.in	2006-05-18 17:51:04.000000000 +0200
+++ new/yast2-vm-2.13.51/configure.in	2006-05-19 12:24:48.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-vm
 dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-vm, 2.13.49, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.51, http://bugs.opensuse.org/, 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.49"
+VERSION="2.13.51"
 RPMNAME="yast2-vm"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
@@ -110,8 +110,8 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
 dnl producing pkg-config for others?
 AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -138,6 +138,10 @@
 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; 
@@ -151,7 +155,8 @@
 control/Makefile
 doc/autodocs/Makefile
 doc/Makefile
-src/Makefile)
+src/Makefile
+testsuite/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.50/src/inst_xen_create.ycp new/yast2-vm-2.13.51/src/inst_xen_create.ycp
--- old/yast2-vm-2.13.50/src/inst_xen_create.ycp	2006-05-05 01:59:11.000000000 +0200
+++ new/yast2-vm-2.13.51/src/inst_xen_create.ycp	2006-05-19 10:52:55.000000000 +0200
@@ -20,6 +20,18 @@
 import "Label";
 import "Mode";
 
+// check whether X window system is accessible
+integer exit_status = (integer) SCR::Execute(.target.bash, "/usr/X11R6/bin/xdpyinfo");
+y2milestone("X check exit status: %1", exit_status);
+
+if (exit_status != 0)
+{
+    // error - the installation runs in xterm, we need access to a X server
+    Report::Error(_("Virtual machine installation requires access to a graphical environment."));
+
+    return `abort;
+}
+
 
 // screen title for the Xen create selection
 string title = _("Create a Virtual Machine");
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.50/src/xen.ycp new/yast2-vm-2.13.51/src/xen.ycp
--- old/yast2-vm-2.13.50/src/xen.ycp	2006-05-17 22:20:14.000000000 +0200
+++ new/yast2-vm-2.13.51/src/xen.ycp	2006-05-19 10:50:17.000000000 +0200
@@ -62,18 +62,6 @@
 	return `abort;
     }
 
-    // check whether X window system is accessible
-    integer exit_status = (integer) SCR::Execute(.target.bash, "/usr/X11R6/bin/xdpyinfo");
-    y2milestone("X check exit status: %1", exit_status);
-
-    if (exit_status != 0)
-    {
-	// error - the installation runs in xterm, we need access to a X server
-	Report::Error(_("Virtual machine installation requires access to a graphical environment."));
-
-	return `abort;
-    }
-
     // abort if the package manager is not available
     // note: Check() displays an error popup
     boolean manager_available = PackageLock::Check();
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.50/testsuite/Makefile.am new/yast2-vm-2.13.51/testsuite/Makefile.am
--- old/yast2-vm-2.13.50/testsuite/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-vm-2.13.51/testsuite/Makefile.am	2005-01-21 18:45:40.000000000 +0100
@@ -0,0 +1,21 @@
+#
+# 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...

    

root＠suse.de

tags

participants (1)