Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory
checked in at Tue Apr 20 02:22:26 CEST 2010.
--------
--- yast2-update/yast2-update.changes 2009-09-08 14:01:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2010-04-19 10:54:48.000000000 +0200
@@ -1,0 +2,18 @@
+Mon Apr 19 10:51:40 CEST 2010 - aschnell@suse.de
+
+- allow btrfs as root fs
+- 2.19.0
+
+-------------------------------------------------------------------
+Thu Jan 28 11:07:00 CET 2010 - locilka@suse.cz
+
+- Counting packages directly in packages proposal (BNC #573482).
+
+------------------------------------------------------------------
+Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
+
+- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
+ where root privileges are needed, removed X-KDE-SubstituteUID key
+ (bnc#540627)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-update-2.18.6.tar.bz2
New:
----
yast2-update-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.WM9XDS/_old 2010-04-20 02:20:31.000000000 +0200
+++ /var/tmp/diff_new_pack.WM9XDS/_new 2010-04-20 02:20:31.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-update (Version 2.18.6)
+# spec file for package yast2-update (Version 2.19.0)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,48 +19,64 @@
Name: yast2-update
-Version: 2.18.6
+Version: 2.19.0
Release: 1
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.18.6.tar.bz2
+Source0: yast2-update-2.19.0.tar.bz2
+
Prefix: /usr
+
Group: System/YaST
-License: GPL v2 or later
-BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-storage yast2-testsuite
+License: GPLv2+
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
+# FileSystems::possible_root_fs
+BuildRequires: yast2-storage >= 2.19.12
# Packages::GetBaseSourceID
BuildRequires: yast2-packager >= 2.17.19
# Wizard::OpenOKDialog
BuildRequires: yast2 >= 2.16.49
# package not really needed to be installed but this breaks the building cycle
+
# xmllint
BuildRequires: libxml2
+
# control.rng
BuildRequires: yast2-installation >= 2.17.44
+
+# FileSystems::possible_root_fs
+Requires: yast2-storage >= 2.19.12
# PackagesUI::RunPackageSelector
Requires: yast2 >= 2.17.40
Requires: yast2-installation
# Function SelectKernelPackages has been moved to Packages module (bnc #326269).
Requires: yast2-packager >= 2.17.27
+
# moved into yast2-update from yast2-installation
# to remove dependency on yast2-storage
Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp
+
# Required only in inst-sys
# Requires: yast2-storage
# Requires: yast2-country
+
# Pkg::PkgUpdateAll (map conf)
Conflicts: yast2-pkg-bindings < 2.15.11
# Storage::DeviceMatchFstab (#244117)
Conflicts: yast2-storage < 2.15.4
+
Summary: YaST2 - Update
%package FACTORY
-License: GPL v2 or later
+License: GPLv2+
Group: System/YaST
PreReq: %fillup_prereq
Requires: yast2-update yast2
+
# moved into yast2-update from yast2-installation
# to remove dependency on yast2-storage
Provides: yast2-update:/usr/share/YaST2/clients/update.ycp
+
Summary: YaST2 - Update
%description
@@ -70,14 +86,16 @@
Use this component if you wish to update your system.
%prep
-%setup -n yast2-update-2.18.6
+%setup -n yast2-update-2.19.0
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
+
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
@@ -99,6 +117,7 @@
%defattr(-,root,root)
%{prefix}/lib/YaST2/bin/*
/usr/share/YaST2/modules/*
+
/usr/share/YaST2/clients/inst_rootpart.ycp
/usr/share/YaST2/clients/inst_update.ycp
/usr/share/YaST2/clients/inst_backup.ycp
@@ -108,8 +127,10 @@
/usr/share/YaST2/clients/backup_proposal.ycp
/usr/share/YaST2/clients/inst_update_partition.ycp
/usr/share/YaST2/clients/rootpart_check_keyboard.ycp
+
/usr/share/YaST2/include/update
/usr/share/YaST2/include/update/rootpart.ycp
+
%doc %{prefix}/share/doc/packages/yast2-update
%files FACTORY
++++++ yast2-update-2.18.6.tar.bz2 -> yast2-update-2.19.0.tar.bz2 ++++++
++++ 4174 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-update-2.18.6/VERSION new/yast2-update-2.19.0/VERSION
--- old/yast2-update-2.18.6/VERSION 2009-09-08 13:53:08.000000000 +0200
+++ new/yast2-update-2.19.0/VERSION 2010-04-19 10:51:33.000000000 +0200
@@ -1 +1 @@
-2.18.6
+2.19.0
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-update-2.18.6/configure.in new/yast2-update-2.19.0/configure.in
--- old/yast2-update-2.18.6/configure.in 2009-09-08 13:55:19.000000000 +0200
+++ new/yast2-update-2.19.0/configure.in 2010-04-19 14:14:28.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.18.6, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.19.0, 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.18.6"
+VERSION="2.19.0"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
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-update-2.18.6/missing new/yast2-update-2.19.0/missing
--- old/yast2-update-2.18.6/missing 2009-09-08 13:55:24.000000000 +0200
+++ new/yast2-update-2.19.0/missing 2010-04-19 14:14:31.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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-update-2.18.6/src/clients/packages_proposal.ycp new/yast2-update-2.19.0/src/clients/packages_proposal.ycp
--- old/yast2-update-2.18.6/src/clients/packages_proposal.ycp 2009-06-24 12:54:15.000000000 +0200
+++ new/yast2-update-2.19.0/src/clients/packages_proposal.ycp 2010-01-28 18:39:31.000000000 +0100
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose packages during update.
*
- * $Id: packages_proposal.ycp 53040 2008-11-07 10:30:00Z locilka $
+ * $Id: packages_proposal.ycp 60593 2010-01-28 10:12:45Z locilka $
*/
{
textdomain "update";
@@ -59,6 +59,46 @@
// SpaceCalculation::ShowPartitionWarning ();
list<string> warning = SpaceCalculation::GetPartitionWarning ();
+ // Count statistics -->
+ // Pkg::GetPackages()
+ // `installed all installed packages
+ // `selected returns all selected but not yet installed packages
+ // `available returns all available packages (from the installation source)
+ // `removed all packages selected for removal
+
+ // recreate the update summary
+ list<string> installed = Pkg::GetPackages (`installed, true);
+ list<string> selected = Pkg::GetPackages (`selected, true);
+ list<string> removed = Pkg::GetPackages (`removed, true);
+ integer cnt_installed = size (installed);
+ integer cnt_selected = size (selected);
+ integer cnt_removed = size (removed);
+ y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed);
+ y2milestone("Removed: %1", removed);
+
+ map installed_m = listmap (string p, installed, {
+ return $[ p : true ];
+ });
+ map selected_m = listmap (string p, selected, {
+ return $[ p : true ];
+ });
+
+ // packages that are both 'installed' && 'selected'
+ Update::packages_to_update = size (filter (string p, selected, {
+ return haskey (installed_m, p);
+ }));
+ // packages that are 'selected' but not 'installed'
+ Update::packages_to_install = cnt_selected - Update::packages_to_update;
+
+ // packages that are 'removed' but not 'selected again'
+ Update::packages_to_remove = size (filter (string p, removed, {
+ return ! haskey (selected_m, p);
+ }));
+
+ y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3",
+ Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove);
+ // <-- Count statistics
+
list<string> tmp = [];
// proposal for packages during update, %1 is count of packages
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-update-2.18.6/src/clients/update_proposal.ycp new/yast2-update-2.19.0/src/clients/update_proposal.ycp
--- old/yast2-update-2.18.6/src/clients/update_proposal.ycp 2009-06-24 12:54:15.000000000 +0200
+++ new/yast2-update-2.19.0/src/clients/update_proposal.ycp 2010-01-28 18:39:31.000000000 +0100
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 52054 2008-10-09 17:18:19Z locilka $
+ * $Id: update_proposal.ycp 60593 2010-01-28 10:12:45Z locilka $
*/
{
textdomain "update";
@@ -304,43 +304,6 @@
Update::products_incompatible = true;
}
}
- // Pkg::GetPackages()
- // `installed all installed packages
- // `selected returns all selected but not yet installed packages
- // `available returns all available packages (from the installation source)
- // `removed all packages selected for removal
-
- // recreate the update summary
- list<string> installed = Pkg::GetPackages (`installed, true);
- list<string> selected = Pkg::GetPackages (`selected, true);
- list<string> removed = Pkg::GetPackages (`removed, true);
- integer cnt_installed = size (installed);
- integer cnt_selected = size (selected);
- integer cnt_removed = size (removed);
- y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed);
- y2milestone("Removed: %1", removed);
-
- map installed_m = listmap (string p, installed, {
- return $[ p : true ];
- });
- map selected_m = listmap (string p, selected, {
- return $[ p : true ];
- });
-
- // packages that are both 'installed' && 'selected'
- Update::packages_to_update = size (filter (string p, selected, {
- return haskey (installed_m, p);
- }));
- // packages that are 'selected' but not 'installed'
- Update::packages_to_install = cnt_selected - Update::packages_to_update;
-
- // packages that are 'removed' but not 'selected again'
- Update::packages_to_remove = size (filter (string p, removed, {
- return ! haskey (selected_m, p);
- }));
-
- y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3",
- Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove);
}
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-update-2.18.6/src/config/update.desktop new/yast2-update-2.19.0/src/config/update.desktop
--- old/yast2-update-2.18.6/src/config/update.desktop 2009-06-24 12:54:15.000000000 +0200
+++ new/yast2-update-2.19.0/src/config/update.desktop 2010-01-14 12:30:13.000000000 +0100
@@ -17,10 +17,9 @@
X-SuSE-YaST-AutoinstResource=
Icon=yast-update
-Exec=/sbin/yast2 update
+Exec=xdg-su -c "/sbin/yast2 update"
Name=FACTORY Update
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' --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-update-2.18.6/src/modules/RootPart.ycp new/yast2-update-2.19.0/src/modules/RootPart.ycp
--- old/yast2-update-2.18.6/src/modules/RootPart.ycp 2009-06-24 12:54:16.000000000 +0200
+++ new/yast2-update-2.19.0/src/modules/RootPart.ycp 2010-04-19 12:27:59.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 57178 2009-05-14 13:00:32Z aschnell $
+ * $Id: RootPart.ycp 61748 2010-04-19 10:27:58Z aschnell $
*/
{
module "RootPart";
@@ -33,8 +33,6 @@
include "partitioning/custom_part_dialogs.ycp";
- // all supported filesystems
- global list possible_root_fs = [ `ext2, `ext3, `ext4, `reiser, `xfs, `jfs ];
// Selected root partition for the update or boot.
global string selectedRootPartition = "";
@@ -119,7 +117,7 @@
return i[what]:"";
// Linux partition, but no root FS found
- } else if (contains (possible_root_fs, i[`fs]:`nil)) {
+ } else if (contains(FileSystems::possible_root_fs, i[`fs]:`nil)) {
// label - name of sustem to update
return _("Unknown Linux System");
@@ -980,8 +978,8 @@
*/
define boolean MountFSTab (list <map> fstab, string& message)
{
- list allowed_fs = [ "ext", "ext2", "ext3", "ext4", "minix", "reiserfs", "jfs",
- "xfs", "xiafs", "hpfs", "vfat", "auto", "proc" ];
+ list allowed_fs = [ "ext", "ext2", "ext3", "ext4", "btrfs", "minix", "reiserfs",
+ "jfs", "xfs", "xiafs", "hpfs", "vfat", "auto", "proc" ];
// mount sysfs first
string ret = MountPartition ("/sys", "sysfs", "sysfs");
@@ -1519,15 +1517,16 @@
symbol p_detect_fs = partition["detected_fs"]:`unknown;
// possible root FS
- if ( contains (possible_root_fs, p_detect_fs))
+ if (contains(FileSystems::possible_root_fs, p_detect_fs))
{
map mt_map = $[
`ext2: "ext2",
`ext3: "ext3",
`ext4: "ext4",
+ `btrfs : "btrfs",
`reiser: "reiserfs",
`xfs: "xfs",
- `jfs: "jfs",
+ `jfs: "jfs"
];
string mount_type = mt_map[p_detect_fs]:"";
@@ -1656,6 +1655,7 @@
ModuleLoading::Load ("xfs", "", "Linux", "XFS", Linuxrc::manual (), true);
ModuleLoading::Load ("ext3", "", "Linux", "Ext3", Linuxrc::manual (), true);
ModuleLoading::Load ("ext4", "", "Linux", "Ext4", Linuxrc::manual (), true);
+ ModuleLoading::Load ("btrfs", "", "Linux", "BtrFS", Linuxrc::manual (), true);
ModuleLoading::Load ("raid0", "", "Linux", "Raid 0", Linuxrc::manual (), true);
ModuleLoading::Load ("raid1", "", "Linux", "Raid 1", Linuxrc::manual (), true);
ModuleLoading::Load ("raid5", "", "Linux", "Raid 5", Linuxrc::manual (), true);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org