Hello community,
here is the log from the commit of package yast2-update
checked in at Fri Mar 21 05:16:05 CET 2008.
--------
--- yast2-update/yast2-update.changes 2008-01-16 09:57:20.000000000 +0100
+++ yast2-update/yast2-update.changes 2008-03-20 13:43:06.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Mar 20 11:37:54 CET 2008 - locilka@suse.cz
+
+- Not displaying a pop-up warning when upgrading ppc to ppc64 and
+ vice versa. The current check can't really distinguish between
+ these two (bnc #372309).
+- Fixed spec.in file to get built (@HEADER@ twice).
+- 2.16.5
+
+-------------------------------------------------------------------
+Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
+
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.16.4.tar.bz2
New:
----
yast2-update-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.Nd3930/_old 2008-03-21 05:15:08.000000000 +0100
+++ /var/tmp/diff_new_pack.Nd3930/_new 2008-03-21 05:15:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.16.4)
+# spec file for package yast2-update (Version 2.16.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,13 +10,14 @@
# norootforbuild
+
Name: yast2-update
-Version: 2.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.16.4.tar.bz2
+Source0: yast2-update-2.16.5.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite
BuildRequires: yast2 >= 2.16.5
@@ -39,13 +40,8 @@
Summary: YaST2 - Update
%package FACTORY
-Version: 2.16.4
-Release: 1
-License: GPL v2 or later
Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.16.4.tar.bz2
-Prefix: /usr
+PreReq: %fillup_prereq
Requires: yast2-update yast2
# moved into yast2-update from yast2-installation
# to remove dependency on yast2-storage
@@ -75,7 +71,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.16.4
+%setup -n yast2-update-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -120,7 +116,16 @@
%{prefix}/share/applications/YaST2/update.desktop
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp
+
%changelog
+* Thu Mar 20 2008 locilka@suse.cz
+- Not displaying a pop-up warning when upgrading ppc to ppc64 and
+ vice versa. The current check can't really distinguish between
+ these two (bnc #372309).
+- Fixed spec.in file to get built (@HEADER@ twice).
+- 2.16.5
+* Mon Mar 17 2008 jsrain@suse.cz
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
* Wed Jan 16 2008 locilka@suse.cz
- Removed build dependency on yast2-country again - removed
forgotten import of Keyboard module.
@@ -781,7 +786,7 @@
* Mon Mar 17 2003 kkaempf@suse.de
- if no product can be determined, use /etc/*-release
- 2.7.11
-* Sat Mar 15 2003 kkaempf@suse.de
+* Sun Mar 16 2003 kkaempf@suse.de
- move the "seen_details" flag to the global Update module (#24927)
- 2.7.10
* Fri Mar 14 2003 kkaempf@suse.de
@@ -839,7 +844,7 @@
a different fstab.
- show installed product if called from running system.
- 2.6.16
-* Wed Sep 11 2002 kkaempf@suse.de
+* Thu Sep 12 2002 kkaempf@suse.de
- implement save/restore for package selection
* Wed Sep 11 2002 kkaempf@suse.de
- neutralize "cups" during update
++++++ yast2-update-2.16.4.tar.bz2 -> yast2-update-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/configure new/yast2-update-2.16.5/configure
--- old/yast2-update-2.16.4/configure 2008-01-16 09:42:23.000000000 +0100
+++ new/yast2-update-2.16.5/configure 2008-03-20 13:40:37.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-update 2.16.3.
+# Generated by GNU Autoconf 2.61 for yast2-update 2.16.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.16.3'
-PACKAGE_STRING='yast2-update 2.16.3'
+PACKAGE_VERSION='2.16.5'
+PACKAGE_STRING='yast2-update 2.16.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-update 2.16.3 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.16.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.16.3:";;
+ short | recursive ) echo "Configuration of yast2-update 2.16.5:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.16.3
+yast2-update configure 2.16.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-update $as_me 2.16.3, which was
+It was created by yast2-update $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.16.3'
+ VERSION='2.16.5'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.3"
+VERSION="2.16.5"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
@@ -2651,8 +2651,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3306,7 +3306,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-update $as_me 2.16.3, which was
+This file was extended by yast2-update $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3349,7 +3349,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.16.3
+yast2-update config.status 2.16.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/configure.in new/yast2-update-2.16.5/configure.in
--- old/yast2-update-2.16.4/configure.in 2008-01-16 09:42:17.000000000 +0100
+++ new/yast2-update-2.16.5/configure.in 2008-03-20 13:40:32.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.16.3, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.16.5, http://bugs.opensuse.org/, yast2-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.3"
+VERSION="2.16.5"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/Makefile.in new/yast2-update-2.16.5/Makefile.in
--- old/yast2-update-2.16.4/Makefile.in 2008-01-16 09:42:24.000000000 +0100
+++ new/yast2-update-2.16.5/Makefile.in 2008-03-20 13:40:39.000000000 +0100
@@ -505,6 +505,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -531,6 +535,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -687,10 +693,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
+ dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/src/clients/update_proposal.ycp new/yast2-update-2.16.5/src/clients/update_proposal.ycp
--- old/yast2-update-2.16.4/src/clients/update_proposal.ycp 2007-12-06 10:03:41.000000000 +0100
+++ new/yast2-update-2.16.5/src/clients/update_proposal.ycp 2008-01-28 19:41:59.000000000 +0100
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 42752 2007-12-06 09:03:40Z locilka $
+ * $Id: update_proposal.ycp 43903 2008-01-25 12:08:37Z locilka $
*/
{
textdomain "update";
@@ -33,6 +33,20 @@
boolean rpm_db_existency_checked_already = false;
+ /**
+ * Function returns map of upgrade-configuration.
+ * Some keys might be missing. In that case, the default libzypp
+ * values will be used. See FATE #301990 and bug #238488.
+ * The keys should be matching keys for Pkg::PkgUpdateAll().
+ *
+ * @return map with a configuration
+ *
+ * @struct $[
+ * "delete_unmaintained" : boolean,
+ * "silent_downgrades" : boolean,
+ * "keep_installed_patches" : boolean,
+ * ]
+ */
map GetUpdateConf () {
// 'nil' values are skipped, in that case, ZYPP uses own default values
map ret = $[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/src/config/update.desktop new/yast2-update-2.16.5/src/config/update.desktop
--- old/yast2-update-2.16.4/src/config/update.desktop 2007-05-18 13:47:11.000000000 +0200
+++ new/yast2-update-2.16.5/src/config/update.desktop 2008-03-19 11:40:12.000000000 +0100
@@ -23,3 +23,4 @@
GenericName=Update your system to the newest packages from FACTORY (expert tool)
Comment=Update your system to the newest packages from FACTORY (expert tool)
X-KDE-SubstituteUID=true
+StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/src/include/rootpart.ycp new/yast2-update-2.16.5/src/include/rootpart.ycp
--- old/yast2-update-2.16.4/src/include/rootpart.ycp 2007-07-04 15:53:30.000000000 +0200
+++ new/yast2-update-2.16.5/src/include/rootpart.ycp 2008-03-20 11:27:49.000000000 +0100
@@ -101,6 +101,23 @@
return part_list;
}
+// Returns whether wanted and selected architectures match
+// bnc #372309
+boolean DoArchitecturesMatch (string arch_1, string arch_2) {
+ list <string> ppc_archs = ["ppc", "ppc64"];
+
+ // exact match
+ if (arch_1 == arch_2) {
+ return true;
+ // ppc exception
+ } else if (contains (ppc_archs, arch_1) && contains (ppc_archs, arch_2)) {
+ return true;
+ }
+
+ // else
+ return false;
+}
+
// This dialog comes in three different flavors: `update_dialog,
// `update_popup and `boot_popup, `update_dialog_proposal
symbol RootPartitionDialog (symbol flavor) {
@@ -280,7 +297,7 @@
_("No installed system that can be upgraded with this product was found
on the selected partition."));
}
- else if (freshman[`arch]:"" != RootPart::GetDistroArch ())
+ else if (! DoArchitecturesMatch (freshman[`arch]:"", RootPart::GetDistroArch()))
{
cont = Popup::ContinueCancel (
// continue-cancel popup
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/src/modules/RootPart.ycp new/yast2-update-2.16.5/src/modules/RootPart.ycp
--- old/yast2-update-2.16.4/src/modules/RootPart.ycp 2008-01-16 09:52:48.000000000 +0100
+++ new/yast2-update-2.16.5/src/modules/RootPart.ycp 2008-03-20 12:33:08.000000000 +0100
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 43642 2008-01-16 08:52:48Z locilka $
+ * $Id: RootPart.ycp 45636 2008-03-20 11:33:08Z locilka $
*/
{
module "RootPart";
@@ -25,9 +25,11 @@
import "FileUtils";
import "Arch";
import "String";
+ import "Installation";
+ import "Report";
+ import "Label";
+ import "Stage";
- include "partitioning/partition_defines.ycp";
- include "partitioning/custom_part_helptexts.ycp";
include "partitioning/custom_part_dialogs.ycp";
// all supported filesystems
@@ -1547,6 +1549,7 @@
global void Detect () {
if (!didSearchForRootPartitions)
{
+ // FIXME: can we use a Progress for that?
UI::OpenDialog (`opt(`decorated ),
// label
`Label(_("Evaluating root partition. One moment please...")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.4/VERSION new/yast2-update-2.16.5/VERSION
--- old/yast2-update-2.16.4/VERSION 2008-01-16 09:52:39.000000000 +0100
+++ new/yast2-update-2.16.5/VERSION 2008-03-20 11:42:15.000000000 +0100
@@ -1 +1 @@
-2.16.4
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org