Hello community,
here is the log from the commit of package autoyast2
checked in at Wed Mar 29 21:11:54 CEST 2006.
--------
--- autoyast2/autoyast2.changes 2006-03-29 16:55:35.000000000 +0200
+++ autoyast2/autoyast2.changes 2006-03-29 20:07:23.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 19:27:40 CEST 2006 - jsrain@suse.de
+
+- fixed add-on products installation integration (#161792)
+- 2.13.37
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.13.36.tar.bz2
New:
----
autoyast2-2.13.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.CfO8cD/_old 2006-03-29 21:11:28.000000000 +0200
+++ /var/tmp/diff_new_pack.CfO8cD/_new 2006-03-29 21:11:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.13.36)
+# spec file for package autoyast2 (Version 2.13.37)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
URL: http://www.suse.com/
-Version: 2.13.36
+Version: 2.13.37
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.13.36.tar.bz2
+Source0: autoyast2-2.13.37.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -48,7 +48,7 @@
Anas Nashif
%package installation
-Version: 2.13.36
+Version: 2.13.37
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -68,7 +68,7 @@
Anas Nashif
%package utils
-Version: 2.13.36
+Version: 2.13.37
Release: 1
Summary: YaST2 - Auto Installation Utilities
Group: System/YaST
@@ -81,7 +81,7 @@
%prep
-%setup -n autoyast2-2.13.36
+%setup -n autoyast2-2.13.37
%build
%{prefix}/bin/y2tool y2autoconf
@@ -228,6 +228,9 @@
/usr/bin/create_update_source.sh
%changelog -n autoyast2
+* Wed Mar 29 2006 - jsrain@suse.de
+- fixed add-on products installation integration (#161792)
+- 2.13.37
* Wed Mar 29 2006 - ug@suse.de
- set SoftLock to avoid the installation of recommended
patterns (#159466)
++++++ autoyast2-2.13.36.tar.bz2 -> autoyast2-2.13.37.tar.bz2 ++++++
++++ 2503 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/autoyast2-2.13.36/Makefile.am new/autoyast2-2.13.37/Makefile.am
--- old/autoyast2-2.13.36/Makefile.am 2006-03-29 16:51:16.000000000 +0200
+++ new/autoyast2-2.13.37/Makefile.am 2006-03-29 20:06:51.000000000 +0200
@@ -6,7 +6,8 @@
# (Edit ./SUBDIRS instead)
#
-PREFIX = /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +31,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 +62,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
@@ -153,7 +154,7 @@
$(PREFIX)/bin/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
@@ -198,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
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/autoyast2-2.13.36/Makefile.am.common new/autoyast2-2.13.37/Makefile.am.common
--- old/autoyast2-2.13.36/Makefile.am.common 2006-03-29 16:51:16.000000000 +0200
+++ new/autoyast2-2.13.37/Makefile.am.common 2006-03-29 20:06:51.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/autoyast2-2.13.36/VERSION new/autoyast2-2.13.37/VERSION
--- old/autoyast2-2.13.36/VERSION 2006-03-29 16:50:43.000000000 +0200
+++ new/autoyast2-2.13.37/VERSION 2006-03-29 20:06:03.000000000 +0200
@@ -1 +1 @@
-2.13.36
+2.13.37
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/autoyast2-2.13.36/configure.in new/autoyast2-2.13.37/configure.in
--- old/autoyast2-2.13.36/configure.in 2006-03-29 16:51:16.000000000 +0200
+++ new/autoyast2-2.13.37/configure.in 2006-03-29 20:06:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.13.36, http://www.suse.de/feedback, autoyast2)
+AC_INIT(autoyast2, 2.13.37, http://www.suse.de/feedback, autoyast2)
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.36"
+VERSION="2.13.37"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -114,8 +114,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)
@@ -142,6 +142,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
AX_CHECK_DOCBOOK
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/autoyast2-2.13.36/src/clients/inst_autosetup.ycp new/autoyast2-2.13.37/src/clients/inst_autosetup.ycp
--- old/autoyast2-2.13.36/src/clients/inst_autosetup.ycp 2006-03-28 11:30:38.000000000 +0200
+++ new/autoyast2-2.13.37/src/clients/inst_autosetup.ycp 2006-03-29 20:05:58.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif
* Uwe Gansert
*
- * $Id: inst_autosetup.ycp 29454 2006-03-28 09:30:36Z ug $
+ * $Id: inst_autosetup.ycp 29544 2006-03-29 18:05:28Z jsrain $
*/
{
@@ -114,10 +114,6 @@
askDialog();
Call::Function("add-on_auto", ["Import", Profile::current["add-on"]:$[]] );
Call::Function("add-on_auto", ["Write"]);
- /* FIXME: this breaks autoinstallation but is needed for addon support.
- if( ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true) == `next )
- return `finish;
- */
//
// Set Mouse and other workflow variables
@@ -224,5 +220,8 @@
AutoInstall::TurnOff();
Progress::Finish();
- return `next;
+ symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true);
+ if (ret == `next)
+ return `finish;
+ return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...