Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-installation
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 20 Apr 2006 18:04:40 +0200 (CEST)
  • Message-id: <20060420160440.2EE618BE91@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation
checked in at Thu Apr 20 18:04:39 CEST 2006.

--------
--- yast2-installation/yast2-installation.changes 2006-04-19 20:09:11.000000000 +0200
+++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-20 16:09:28.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 20 16:09:23 CEST 2006 - mvidner@xxxxxxx
+
+- When cloning, save installation sources beforehand (#165860).
+- 2.13.80
+
+-------------------------------------------------------------------

Old:
----
yast2-installation-2.13.79.tar.bz2

New:
----
yast2-installation-2.13.80.tar.bz2

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.lq0KF0/_old 2006-04-20 18:03:21.000000000 +0200
+++ /var/tmp/diff_new_pack.lq0KF0/_new 2006-04-20 18:03:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.79)
+# spec file for package yast2-installation (Version 2.13.80)
#
# 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-installation
-Version: 2.13.79
+Version: 2.13.80
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.79.tar.bz2
+Source0: yast2-installation-2.13.80.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-installation-2.13.79
+%setup -n yast2-installation-2.13.80

%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,9 @@
/usr/X11R6/share/fvwm/

%changelog -n yast2-installation
+* Thu Apr 20 2006 - mvidner@xxxxxxx
+- When cloning, save installation sources beforehand (#165860).
+- 2.13.80
* Wed Apr 19 2006 - jsrain@xxxxxxx
- restore buttons after calling DASD or zFCP module (#160399)
- 2.13.79

++++++ yast2-installation-2.13.79.tar.bz2 -> yast2-installation-2.13.80.tar.bz2 ++++++
++++ 14380 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-installation-2.13.79/Makefile.am new/yast2-installation-2.13.80/Makefile.am
--- old/yast2-installation-2.13.79/Makefile.am 2006-04-19 20:06:19.000000000 +0200
+++ new/yast2-installation-2.13.80/Makefile.am 2006-04-20 16:25:17.000000000 +0200
@@ -8,6 +8,7 @@

#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)
@@ -95,7 +96,7 @@
done

pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)

install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi

spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck

# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))

@@ -143,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 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 \
@@ -200,12 +201,12 @@
fi

check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)

stable: checkin-stable

checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable


# For po/ modules
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-installation-2.13.79/VERSION new/yast2-installation-2.13.80/VERSION
--- old/yast2-installation-2.13.79/VERSION 2006-04-19 20:04:49.000000000 +0200
+++ new/yast2-installation-2.13.80/VERSION 2006-04-20 16:06:22.000000000 +0200
@@ -1 +1 @@
-2.13.79
+2.13.80
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-installation-2.13.79/configure.in new/yast2-installation-2.13.80/configure.in
--- old/yast2-installation-2.13.79/configure.in 2006-04-19 20:06:19.000000000 +0200
+++ new/yast2-installation-2.13.80/configure.in 2006-04-20 16:25:16.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-installation, 2.13.79, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.80, http://www.suse.de/feedback, yast2-installation)
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.79"
+VERSION="2.13.80"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

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-installation-2.13.79/control/docs/control-doc.xml new/yast2-installation-2.13.80/control/docs/control-doc.xml
--- old/yast2-installation-2.13.79/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100
+++ new/yast2-installation-2.13.80/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.13.79/src/clients/inst_congratulate.ycp new/yast2-installation-2.13.80/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.13.79/src/clients/inst_congratulate.ycp 2006-04-04 20:07:02.000000000 +0200
+++ new/yast2-installation-2.13.80/src/clients/inst_congratulate.ycp 2006-04-20 16:09:36.000000000 +0200
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 29611 2006-04-03 12:22:08Z ug $
+ * $Id: inst_congratulate.ycp 30290 2006-04-20 14:09:31Z mvidner $
*/

{
@@ -140,6 +140,11 @@
//Wizard::RestoreNextButton ();

if (UI::WidgetExists(`id(`do_clone)) && ret == `next && (boolean)UI::QueryWidget (`id(`do_clone), `Value)) {
+ // #165860
+ // Save sources now because cloning garbles the target
+ // Cloning reinitializes sources when it needs them
+ Pkg::SourceFinishAll ();
+
Call::Function("clone_system" , ["doClone"]);
}

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-installation-2.13.79/src/clients/installation.ycp new/yast2-installation-2.13.80/src/clients/installation.ycp
--- old/yast2-installation-2.13.79/src/clients/installation.ycp 2006-02-17 23:59:24.000000000 +0100
+++ new/yast2-installation-2.13.80/src/clients/installation.ycp 2006-04-20 16:09:37.000000000 +0200
@@ -12,7 +12,7 @@
* Describing and calling all submodules, depending on
* the installation should be started or continued.
*
- * $Id: installation.ycp 28136 2006-02-17 22:58:49Z jsrain $
+ * $Id: installation.ycp 30290 2006-04-20 14:09:31Z mvidner $
*/
{
textdomain "installation";
@@ -404,7 +404,7 @@
}

// disable all sources and finish target
- Pkg::SourceFinishAll();
+ Pkg::SourceFinishAll(); // but see also inst_congratulate, #165860
Pkg::TargetFinish();

UI::CloseDialog();


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



Remember to have fun...


< Previous Next >