October 2007 - openSUSE Commits - openSUSE Mailing Lists

commit curl
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package curl checked in at Wed Oct 31 16:51:43 CET 2007. -------- --- curl/curl.changes 2007-10-11 16:21:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/curl/curl.changes 2007-10-30 09:16:49.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Oct 30 09:14:04 CET 2007 - mmarek(a)suse.cz + +- updated to 7.17.1 + * automatically append ";type=<a|i>" when using HTTP proxies for + FTP urls [#306272] + * improved NSS support + * added --proxy-negotiate + * added --post301 and CURLOPT_POST301 + * builds with c-ares 1.5.0 + * added CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 and --hostpubmd5 + * renamed CURLE_SSL_PEER_CERTIFICATE to + CURLE_PEER_FAILED_VERIFICATION + * added CURLOPT_OPENSOCKETFUNCTION and CURLOPT_OPENSOCKETDATA + * CULROPT_COOKIELIST supports "FLUSH" + * added CURLOPT_COPYPOSTFIELDS + * added --static-libs to curl-config + * many bugfixes, inc. fix for bug #332917 + +------------------------------------------------------------------- Old: ---- curl-7.17.0-cvs-fixes.patch curl-7.17.0.tar.bz2 New: ---- curl-7.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.s13046/_old 2007-10-31 16:51:08.000000000 +0100 +++ /var/tmp/diff_new_pack.s13046/_new 2007-10-31 16:51:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package curl (Version 7.17.0) +# spec file for package curl (Version 7.17.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,15 +12,14 @@ Name: curl BuildRequires: libidn-devel libopenssl-devel openldap2-devel zlib-devel -Version: 7.17.0 -Release: 3 +Version: 7.17.1 +Release: 1 AutoReqProv: on License: BSD 3-Clause; X11/MIT Group: Productivity/Networking/Web/Utilities Summary: A Tool for Transferring Data from URLs Url: http://curl.haxx.se/ Source: curl-%{version}.tar.bz2 -Patch0: curl-7.17.0-cvs-fixes.patch Patch2: curl-ipv6tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,7 +84,6 @@ %prep %setup -q -%patch0 %patch2 %build @@ -157,6 +155,22 @@ %doc %{_mandir}/man1/curl-config.1.gz %doc %{_mandir}/man3/* %changelog +* Tue Oct 30 2007 - mmarek(a)suse.cz +- updated to 7.17.1 + * automatically append ";type=<a|i>" when using HTTP proxies for + FTP urls [#306272] + * improved NSS support + * added --proxy-negotiate + * added --post301 and CURLOPT_POST301 + * builds with c-ares 1.5.0 + * added CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 and --hostpubmd5 + * renamed CURLE_SSL_PEER_CERTIFICATE to + CURLE_PEER_FAILED_VERIFICATION + * added CURLOPT_OPENSOCKETFUNCTION and CURLOPT_OPENSOCKETDATA + * CULROPT_COOKIELIST supports "FLUSH" + * added CURLOPT_COPYPOSTFIELDS + * added --static-libs to curl-config + * many bugfixes, inc. fix for bug #332917 * Thu Oct 11 2007 - mszeredi(a)suse.de - Add missing dependency (openldap2-devel) for libcurl-devel * Mon Oct 08 2007 - mmarek(a)suse.cz ++++++ curl-7.17.0.tar.bz2 -> curl-7.17.1.tar.bz2 ++++++ ++++ 27844 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aspell-dictionaries
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package aspell-dictionaries checked in at Wed Oct 31 16:51:00 CET 2007. -------- --- aspell-dictionaries/aspell-dictionaries.changes 2007-09-03 18:11:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/aspell-dictionaries/aspell-dictionaries.changes 2007-10-31 13:46:00.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 13:44:35 CET 2007 - lmichnovic(a)suse.cz + +- updated nds dictionary from CVS [#337416] + +------------------------------------------------------------------- Old: ---- aspell-nds-0.01-0.tar.bz2 New: ---- aspell-nds-0.01-20071031.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aspell-dictionaries.spec ++++++ ++++ 902 lines (skipped) ++++ between aspell-dictionaries/aspell-dictionaries.spec ++++ and /mounts/work_src_done/STABLE/aspell-dictionaries/aspell-dictionaries.spec ++++++ aspell-nds-0.01-0.tar.bz2 -> aspell-nds-0.01-20071031.tar.bz2 ++++++ ++++ 3345 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package yast2-update checked in at Wed Oct 31 16:48:47 CET 2007. -------- --- yast2-update/yast2-update.changes 2007-08-28 12:37:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-10-31 13:22:22.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Oct 31 13:21:55 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.0 + +------------------------------------------------------------------- +Thu Oct 25 14:00:51 CEST 2007 - locilka(a)suse.cz + +- Never list duplicate entries in "upgrade based on products" in + upgrade proposal (#331560). + +------------------------------------------------------------------- Old: ---- yast2-update-2.15.23.tar.bz2 New: ---- yast2-update-2.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.lh5082/_old 2007-10-31 16:48:31.000000000 +0100 +++ /var/tmp/diff_new_pack.lh5082/_new 2007-10-31 16:48:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.15.23) +# spec file for package yast2-update (Version 2.16.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,17 +11,20 @@ # norootforbuild Name: yast2-update -Version: 2.15.23 +Version: 2.16.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.15.23.tar.bz2 -prefix: /usr -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-packager yast2-storage yast2-testsuite +Source0: yast2-update-2.16.0.tar.bz2 +Prefix: /usr +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite +BuildRequires: yast2 >= 2.16.4 # package not really needed to be installed but this breaks the building cycle +# FIXME !!! #!BuildIgnore: autoyast2-installation -Requires: yast2 +# Installation::installedVersion && Installation::updateVersion +Requires: yast2 >= 2.16.4 Requires: yast2-installation Requires: yast2-packager # moved into yast2-update from yast2-installation @@ -34,14 +37,15 @@ # Storage::DeviceMatchFstab (#244117) Conflicts: yast2-storage < 2.15.4 Summary: YaST2 - Update + %package FACTORY -Version: 2.15.23 +Version: 2.16.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.15.23.tar.bz2 -prefix: /usr +Source0: yast2-update-2.16.0.tar.bz2 +Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools Requires: yast2-update yast2 # moved into yast2-update from yast2-installation @@ -60,7 +64,6 @@ Arvin Schnell <arvin(a)suse.de> Jiri Srain <jsrain(a)suse.cz> - %description FACTORY Use this component if you wish to update your system. @@ -73,7 +76,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.15.23 +%setup -n yast2-update-2.16.0 %build %{prefix}/bin/y2tool y2autoconf @@ -117,8 +120,14 @@ %{prefix}/share/applications/YaST2/update.desktop /usr/share/YaST2/control/update.xml /usr/share/YaST2/clients/update.ycp - %changelog +* Wed Oct 31 2007 - locilka(a)suse.cz +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.0 +* Thu Oct 25 2007 - locilka(a)suse.cz +- Never list duplicate entries in "upgrade based on products" in + upgrade proposal (#331560). * Tue Aug 28 2007 - locilka(a)suse.cz - Update proposal doesn't use recommended Kernel if the package is not available (#304646). ++++++ yast2-update-2.15.23.tar.bz2 -> yast2-update-2.16.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.23/README new/yast2-update-2.16.0/README --- old/yast2-update-2.15.23/README 2007-08-29 13:33:56.000000000 +0200 +++ new/yast2-update-2.16.0/README 2007-10-31 13:39:08.000000000 +0100 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYRIGHT.english for license terms +See the file COPYING for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.23/src/clients/inst_update.ycp new/yast2-update-2.16.0/src/clients/inst_update.ycp --- old/yast2-update-2.15.23/src/clients/inst_update.ycp 2007-05-18 10:44:11.000000000 +0200 +++ new/yast2-update-2.16.0/src/clients/inst_update.ycp 2007-10-31 13:38:53.000000000 +0100 @@ -9,7 +9,7 @@ * Show checkboxes for software categories. Let the user select his software. * if he want to UPGRADE his system. * - * $Id: inst_update.ycp 37403 2007-04-11 16:23:39Z locilka $ + * $Id: inst_update.ycp 41677 2007-10-31 12:38:53Z locilka $ */ { @@ -20,7 +20,7 @@ import "RootPart"; import "Update"; import "Packages"; - + import "Installation"; // screen title for update options string title = _("Update Options"); @@ -69,8 +69,8 @@ // Build and show dialog - string from_version = Update::installedVersion["show"]:_("Unknown"); - string to_version = Update::updateVersion["show"]:_("Unknown"); + string from_version = Installation::installedVersion["show"]:_("Unknown"); + string to_version = Installation::updateVersion["show"]:_("Unknown"); string update_label = ""; if (from_version == to_version) { @@ -131,7 +131,7 @@ updates the existing software and installs all new features and benefits of the new <tt>%1</tt> version. The selection is based on the former predefined software selection. -"), Update::updateVersion["show"]:""); +"), Installation::updateVersion["show"]:""); // help text for dialog "update options" 3/4 helptext = helptext + _("Only Installed Packages: This selection diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.23/src/clients/update_proposal.ycp new/yast2-update-2.16.0/src/clients/update_proposal.ycp --- old/yast2-update-2.15.23/src/clients/update_proposal.ycp 2007-08-28 12:37:28.000000000 +0200 +++ new/yast2-update-2.16.0/src/clients/update_proposal.ycp 2007-10-31 13:27:31.000000000 +0100 @@ -5,7 +5,7 @@ * * Purpose: Let user choose update settings. * - * $Id: update_proposal.ycp 40528 2007-08-28 10:37:27Z locilka $ + * $Id: update_proposal.ycp 41673 2007-10-31 12:27:31Z locilka $ */ { textdomain "update"; @@ -448,22 +448,22 @@ // TRANSLATORS: unknown product (label) string update_from = _("Unknown product"); - if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { - update_from = Update::installedVersion["show"]:""; - } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { - update_from = Update::installedVersion["name"]:""; + if (Installation::installedVersion["show"]:"" != "" && Installation::installedVersion["show"]:"?" != "?") { + update_from = Installation::installedVersion["show"]:""; + } else if (Installation::installedVersion["version"]:"" != "" && Installation::installedVersion["version"]:"?" != "?") { + update_from = Installation::installedVersion["name"]:""; } // TRANSLATORS: unknown product (label) string update_to = _("Unknown product"); - if (Update::updateVersion["show"]:"" != "") { - update_to = Update::updateVersion["show"]:""; - } else if (Update::updateVersion["version"]:"" != "") { - update_to = Update::updateVersion["name"]:""; + if (Installation::updateVersion["show"]:"" != "") { + update_to = Installation::updateVersion["show"]:""; + } else if (Installation::updateVersion["version"]:"" != "") { + update_to = Installation::updateVersion["name"]:""; } // when versions don't match and upgrade is not allowed (running system) - if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { + if ((Installation::installedVersion["version"]:"A" != Installation::updateVersion["version"]:"B") && Update::disallow_upgrade) { return $[ "warning" : sformat( // TRANSLATORS: proposal error, %1 is the version of installed system // %2 is the version being installed @@ -479,14 +479,14 @@ string warning_message = nil; // when labels don't match - if (!Stage::initial() && (Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B")) { + if (!Stage::initial() && (Installation::installedVersion["show"]:"A" != Installation::updateVersion["show"]:"B")) { warning_message = sformat( // TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names _("Warning: Updating from '%1' to '%2', products do not exactly match."), // TRANSLATORS: unknown product name - Update::installedVersion["show"]:_("Unknown product"), + Installation::installedVersion["show"]:_("Unknown product"), // TRANSLATORS: unknown product name - Update::updateVersion["show"]:_("Unknown product") + Installation::updateVersion["show"]:_("Unknown product") ); } @@ -494,10 +494,20 @@ string summary_text = ""; list <string> products = Update::SelectedProducts (); + list <string> already_printed = []; + if (products != nil) { foreach (string one_product, products, { + // never print duplicates, bugzilla #331560 + // 'toset' could be used but we want to keep sorting + if (contains (already_printed, one_product)) { + return; + } else { + already_printed = add (already_printed, one_product); + } + // TRANSLATORS: proposal summary item, %1 is a product name - summary_text = summary_text + "<li>" + sformat (_("Update to %1"), one_product) + "</li>\n"; + summary_text = summary_text + "<li>" + sformat (_("Update to %1"), one_product) + "</li>\n"; }); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.23/src/modules/RootPart.ycp new/yast2-update-2.16.0/src/modules/RootPart.ycp --- old/yast2-update-2.15.23/src/modules/RootPart.ycp 2007-08-27 14:21:12.000000000 +0200 +++ new/yast2-update-2.16.0/src/modules/RootPart.ycp 2007-10-31 13:22:48.000000000 +0100 @@ -6,7 +6,7 @@ * Purpose: Responsible for searching of root partitions and * mounting of target partitions. * - * $Id: RootPart.ycp 40499 2007-08-27 12:21:11Z locilka $ + * $Id: RootPart.ycp 41669 2007-10-31 12:22:48Z locilka $ */ { module "RootPart"; @@ -571,7 +571,7 @@ * @param mountpoint string a mount point to find * @return string the found partition */ -define string FindPartitionInFstab (list<map> fstab, string mountpoint) { +define string FindPartitionInFstab (list <map> & fstab, string mountpoint) { if (substring (mountpoint, size (mountpoint) - 1, 1) == "/") mountpoint = substring (mountpoint, 0, size (mountpoint) - 1); @@ -609,7 +609,7 @@ if (cmd["exit"]:nil != nil) { list <string> files = splitstring (cmd["stdout"]:"", "\n"); integer files_count = size (files); - if (files_count == nil || files_count <= 3) { + if (files_count == nil || files_count <= 2) { y2error ("There are only %1 files in /var/lib/hardware/, translation needn't work!", files_count); } else { y2milestone ("There are %1 files in /var/lib/hardware/", files_count); @@ -624,7 +624,7 @@ // translate them list <string> new_names = Storage::GetTranslatedDevices ( - Update::installedVersion, Update::updateVersion, old_names + Installation::installedVersion, Installation::updateVersion, old_names ); integer i = 0; @@ -726,10 +726,19 @@ } } + boolean FstabHasSeparateVar (list <map> & fstab) { + string var_device_fstab = FindPartitionInFstab (fstab, "/var"); + y2milestone ("/var partition is %1", var_device_fstab); + + return (var_device_fstab != nil); + } + + define string MountVarIfRequired (list <map> fstab, string root_device_current); + /** * */ - define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab) + define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab, string root_device_current) { integer default_scr = WFM::SCRGetDefault (); integer new_scr = nil; @@ -748,6 +757,15 @@ Update::GetProductName(); + boolean fstab_has_separate_var = FstabHasSeparateVar (fstab); + // mount /var + if (fstab_has_separate_var) { + y2warning ("Separate /var partition!"); + MountVarIfRequired (fstab, root_device_current); + } else { + y2milestone ("No separate /var partition found"); + } + y2milestone ("fstab: %1", fstab); fstab = TranslateFsOrCryptoTab (fstab, "spec", "spec_old"); y2milestone ("fstab: (translated) %1", fstab); @@ -756,6 +774,11 @@ crtab = TranslateFsOrCryptoTab (crtab, "file", "file_old"); y2milestone ("crtab: (translated) %1", crtab); + // umount /var + if (fstab_has_separate_var) { + SCR::Execute (.target.umount, Installation::destdir + "/var"); + } + return true; } @@ -1089,7 +1112,7 @@ string err_message = nil; if (mount_err != nil) { - y2error ("failed to mount /var"); + y2error (-1, "failed to mount /var"); err_message = sformat ( // error message _("The /var partition %1 could not be mounted.\n"), @@ -1107,8 +1130,12 @@ define string MountVarIfRequired (list <map> fstab, string root_device_current) { string var_device_fstab = FindPartitionInFstab (fstab, "/var"); - if (var_device_fstab == nil) + + // No need to mount "/var", it's not separate == already mounted with "/" + if (var_device_fstab == nil) { + y2milestone ("Not a separate /var..."); return nil; + } if (!Storage::DeviceRealDisk (var_device_fstab)) return MountVarPartition (var_device_fstab); @@ -1185,7 +1212,7 @@ // typing passwords for encrypted partitions Keyboard::CheckKeyboardDuringUpdate (Installation::destdir); - read_fstab_and_cryptotab (fstab, crtab); + read_fstab_and_cryptotab (fstab, crtab, root_device_current); if (size (fstab) == 0) { @@ -1365,7 +1392,7 @@ list <map> fstab = []; list <map> crtab = []; - read_fstab_and_cryptotab (fstab, crtab); + read_fstab_and_cryptotab (fstab, crtab, p_dev); fstab = filter (map p, fstab, ``(p["file"]:""=="/")); @@ -1508,7 +1535,7 @@ `Label(_("Mounting partitions. One moment please..."))); boolean tmp = RootPart::MountPartitions (RootPart::selectedRootPartition); - sleep (500); + // sleep (500); UI::CloseDialog (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.23/src/modules/Update.ycp new/yast2-update-2.16.0/src/modules/Update.ycp --- old/yast2-update-2.15.23/src/modules/Update.ycp 2007-07-18 09:36:29.000000000 +0200 +++ new/yast2-update-2.16.0/src/modules/Update.ycp 2007-10-31 13:22:48.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 39486 2007-07-18 07:36:28Z locilka $ + * $Id: Update.ycp 41669 2007-10-31 12:22:48Z locilka $ */ { module "Update"; @@ -68,25 +68,17 @@ global boolean products_incompatible = false; - - /* - * Information about old and new product. - * - * They do contain: - * name (string), e.g. "SuSE Linux" - * version (string), e.g. "9.1" - * nameandversion (string), e.g. "SuSE Linux 9.1" - * - * They may contain: - * major (integer), e.g. "9" - * minor (integer), e.g. "1" - */ - // Version of the targetsystem - global map <string, any> installedVersion = $[]; + // + // !!! moved to Installation::installedVersion !!! + // + // global map <string, any> installedVersion = $[]; // Version of the source medium - global map <string, any> updateVersion = $[]; + // + // !!! moved to Installation::updateVersion !!! + // + // global map <string, any> updateVersion = $[]; // Flag, if the basesystem have to be installed @@ -472,13 +464,13 @@ /** * Read product name and version for the old and new release. - * Fill installedVersion and updateVersion. + * Fill Installation::installedVersion and Installation::updateVersion. * @return success */ global define boolean GetProductName () { - installedVersion = $[]; - updateVersion = $[]; + Installation::installedVersion = $[]; + Installation::updateVersion = $[]; // get old product name @@ -501,32 +493,32 @@ if (p == nil) { y2error ("release info <%1> is screwed", old_name); - installedVersion = $[]; + Installation::installedVersion = $[]; } else { - installedVersion["show"] = old_name; - installedVersion["name"] = substring (old_name, 0, p); - installedVersion["version"] = substring (old_name, p + 1); - fill_version_map (installedVersion); + Installation::installedVersion["show"] = old_name; + Installation::installedVersion["name"] = substring (old_name, 0, p); + Installation::installedVersion["version"] = substring (old_name, p + 1); + fill_version_map (Installation::installedVersion); } // "minor" and "major" version keys // bug #153576, "version" == "9" or "10.1" or ... - string inst_ver = installedVersion["version"]:""; + string inst_ver = Installation::installedVersion["version"]:""; if (inst_ver != "" && inst_ver != nil) { // SLE, SLD, OES... if (regexpmatch (inst_ver, "^[0123456789]+$")) { - installedVersion["major"] = tointeger (inst_ver); + Installation::installedVersion["major"] = tointeger (inst_ver); // openSUSE } else if (regexpmatch (inst_ver, "^[0123456789]+\.[0123456789]+$")) { - installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); - installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); + Installation::installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); + Installation::installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); } else { y2error("Cannot find out major/minor from >%1<", inst_ver); } } else { - y2error("Cannot find out version: %1", installedVersion); + y2error("Cannot find out version: %1", Installation::installedVersion); } if (Mode::test()) { @@ -541,9 +533,9 @@ if (num <= 0) { y2error ("No source"); - updateVersion["name"] = "?"; - updateVersion["version"] = "?"; - fill_version_map (updateVersion); + Installation::updateVersion["name"] = "?"; + Installation::updateVersion["version"] = "?"; + fill_version_map (Installation::updateVersion); return false; } @@ -556,7 +548,7 @@ // source need to be described if (source_map != $[]) { - if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + if (source_map["productversion"]:"A" == Installation::installedVersion["version"]:"B") { y2milestone ("Found matching product: %1", source_map); // first valid product is selected if (update_to_source == nil) @@ -578,45 +570,45 @@ if (new_product == nil) { - updateVersion["name"] = "?"; - updateVersion["version"] = "?"; - y2error("Cannot find out source details: %1", updateVersion); - fill_version_map (updateVersion); + Installation::updateVersion["name"] = "?"; + Installation::updateVersion["version"] = "?"; + y2error("Cannot find out source details: %1", Installation::updateVersion); + fill_version_map (Installation::updateVersion); return false; } // bugzilla #225256, use "label" first, then a "productname" - updateVersion["show"] = new_product["label"]:nil; - if (updateVersion["show"]:nil == nil) { + Installation::updateVersion["show"] = new_product["label"]:nil; + if (Installation::updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { - updateVersion["show"] = "?"; + Installation::updateVersion["show"] = "?"; } else { - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + Installation::updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; } } - updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; - updateVersion["version"] = new_product["productversion"]:"?"; - fill_version_map (updateVersion); + Installation::updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; + Installation::updateVersion["version"] = new_product["productversion"]:"?"; + fill_version_map (Installation::updateVersion); - string new_ver = updateVersion["version"]:""; + string new_ver = Installation::updateVersion["version"]:""; if (new_ver != "" && new_ver != nil) { // SLE, SLD, OES... if (regexpmatch (new_ver, "^[0123456789]+$")) { - updateVersion["major"] = tointeger (new_ver); + Installation::updateVersion["major"] = tointeger (new_ver); // openSUSE } else if (regexpmatch (new_ver, "^[0123456789]+\.[0123456789]$")) { - updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); - updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); + Installation::updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); + Installation::updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); } else { y2error("Cannot find out major/minor from %1", new_ver); } } else { - y2error("Cannot find out version: %1", updateVersion); + y2error("Cannot find out version: %1", Installation::updateVersion); } - y2milestone ("update from %1 to %2", installedVersion, updateVersion); + y2milestone ("update from %1 to %2", Installation::installedVersion, Installation::updateVersion); return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.23/VERSION new/yast2-update-2.16.0/VERSION --- old/yast2-update-2.15.23/VERSION 2007-08-28 12:37:21.000000000 +0200 +++ new/yast2-update-2.16.0/VERSION 2007-10-31 13:16:58.000000000 +0100 @@ -1 +1 @@ -2.15.23 +2.16.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package yast2-packager checked in at Wed Oct 31 16:48:22 CET 2007. -------- --- yast2-packager/yast2-packager.changes 2007-10-26 13:28:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-10-31 14:14:52.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Oct 31 14:13:07 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- Removed support for converting inittab from SUSE Linux 7.0 and + older during upgrade. +- 2.16.1 + +------------------------------------------------------------------- +Tue Oct 30 09:29:39 CET 2007 - locilka(a)suse.cz + +- Downloading only one localized slideshow (with 'en' localization + as a fallback) instead of downloading the whole directory with + slides (#326327). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.16.0.tar.bz2 New: ---- yast2-packager-2.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.ha3247/_old 2007-10-31 16:47:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ha3247/_new 2007-10-31 16:47:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.16.0) +# spec file for package yast2-packager (Version 2.16.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,16 @@ # norootforbuild Name: yast2-packager -Version: 2.16.0 +Version: 2.16.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.16.0.tar.bz2 +Source0: yast2-packager-2.16.1.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml -BuildRequires: yast2 >= 2.16.2 +# Installation::installedVersion && Installation::updateVersion +BuildRequires: yast2 >= 2.16.4 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings Requires: yast2-country @@ -61,7 +62,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.16.0 +%setup -n yast2-packager-2.16.1 %build %{prefix}/bin/y2tool y2autoconf @@ -101,6 +102,16 @@ /usr/share/YaST2/control/*.xml %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Wed Oct 31 2007 - locilka(a)suse.cz +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- Removed support for converting inittab from SUSE Linux 7.0 and + older during upgrade. +- 2.16.1 +* Tue Oct 30 2007 - locilka(a)suse.cz +- Downloading only one localized slideshow (with 'en' localization + as a fallback) instead of downloading the whole directory with + slides (#326327). * Fri Oct 26 2007 - lslezak(a)suse.cz - package kernel-bigsmp has been renamed to kernel-pae - handle `close event (dialog closed by WM) (#335472) ++++++ yast2-packager-2.16.0.tar.bz2 -> yast2-packager-2.16.1.tar.bz2 ++++++ ++++ 4883 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-packager-2.16.0/configure.in new/yast2-packager-2.16.1/configure.in --- old/yast2-packager-2.16.0/configure.in 2007-10-26 13:14:11.000000000 +0200 +++ new/yast2-packager-2.16.1/configure.in 2007-09-03 16:48:10.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.16.0, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.74, http://bugs.opensuse.org/, yast2-packager) 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.16.0" +VERSION="2.15.74" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" 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-packager-2.16.0/Makefile.am new/yast2-packager-2.16.1/Makefile.am --- old/yast2-packager-2.16.0/Makefile.am 2007-10-26 13:14:11.000000000 +0200 +++ new/yast2-packager-2.16.1/Makefile.am 2007-09-03 16:48:10.000000000 +0200 @@ -30,7 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal 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-packager-2.16.0/missing new/yast2-packager-2.16.1/missing --- old/yast2-packager-2.16.0/missing 2007-10-26 13:14:18.000000000 +0200 +++ new/yast2-packager-2.16.1/missing 2007-09-03 16:48:15.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,8 +33,6 @@ fi run=: -sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' -sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -46,7 +44,7 @@ msg="missing on your system" -case $1 in +case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -79,7 +77,6 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -109,7 +106,7 @@ # 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). -case $1 in +case "$1" in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -138,7 +135,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case "$1" in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -167,7 +164,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case $f in + case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -195,8 +192,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` if test -f "$file"; then touch $file else @@ -217,25 +214,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if test ! -f y.tab.h; then + if [ ! -f y.tab.h ]; then echo >y.tab.h fi - if test ! -f y.tab.c; then + if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -247,18 +244,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if test ! -f lex.yy.c; then + if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -270,9 +267,11 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` + fi + if [ -f "$file" ]; then touch $file else test -z "$file" || exec >$file @@ -290,17 +289,11 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* $[^ ]*$ *$/\1/ - p - q - }' $infile` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -324,13 +317,13 @@ fi firstarg="$1" if shift; then - case $firstarg in + case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case $firstarg in + case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 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-packager-2.16.0/README new/yast2-packager-2.16.1/README --- old/yast2-packager-2.16.0/README 2007-10-26 13:28:28.000000000 +0200 +++ new/yast2-packager-2.16.1/README 2007-10-31 15:39:49.000000000 +0100 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYRIGHT.english for license terms +See the file COPYING for license terms 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-packager-2.16.0/src/clients/inst_kickoff.ycp new/yast2-packager-2.16.1/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.16.0/src/clients/inst_kickoff.ycp 2007-07-19 13:46:48.000000000 +0200 +++ new/yast2-packager-2.16.1/src/clients/inst_kickoff.ycp 2007-10-31 15:39:28.000000000 +0100 @@ -5,7 +5,7 @@ * * Purpose: Do various tasks before starting with installation of rpms. * - * $Id: inst_kickoff.ycp 39526 2007-07-19 11:46:47Z lslezak $ + * $Id: inst_kickoff.ycp 41692 2007-10-31 14:39:27Z locilka $ * */ @@ -16,7 +16,6 @@ import "Stage"; import "Linuxrc"; import "Installation"; - import "Update"; import "Popup"; import "Directory"; import "ModuleLoading"; @@ -27,6 +26,7 @@ import "Arch"; import "FileUtils"; import "String"; + import "Update"; void AcpiToInitrd () { if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) @@ -215,57 +215,6 @@ } } - - /** - * Update and convert inittab. - */ - define void update_inittab () ``{ - - // /etc/inittab will be overridden by package aaa_base. So we will - // have to save the run-level - // The runlevel-values have been changed since version 7.0; So we - // have to handle older version in a special case. - - string idfile = (string) SCR::Read(.target.tmpdir) + "/idline"; - if (SCR::Execute (.target.bash, "/bin/grep ^id: " + - "'" + String::Quote (Installation::destdir) + "/etc/inittab" + "'" + - " >" + idfile) == 0) - { - // idline = "id:X:initdefault:" - - string idline = (string) SCR::Read(.target.string, idfile); - - // idsplit = "id", "X", "initdefault", "" - list idsplit = splitstring (idline, ":"); - - integer initdefault = -1; - if (size (idsplit) > 2) - { - initdefault = tointeger (idsplit[1]:"3"); - } - - y2milestone ("run-level %1 found", initdefault); - - if (Update::installedVersion["name"]:"" == "SuSE Linux") - { - integer oldmajor = Update::installedVersion["major"]:-1; - integer oldminor = Update::installedVersion["minor"]:-1; - - if (oldmajor >= 0 && oldminor >= 0) - { - if ((oldmajor < 7) || (oldmajor == 7 && oldminor == 0)) - { - // position == old, value == new - list new_levels = [ 0, 0, 3, 5, 4, 4 ]; // 0->0, 1->0, 2->3, 3->5, 4->4, 5->4 - initdefault = new_levels[initdefault]:5; - } - } - } - - Update::last_runlevel = initdefault; // evaluated in inst_finish - } - } - /** * Create /etc/mdadm.conf if it does not exist and it's needed * bugs: #169710 and #146304 @@ -341,10 +290,8 @@ * Calls a local command and returns if successful */ define boolean LocalCommand (string command) { - // FIXME: can be changed into y2debug() later - eat2minestrone (sformat ("Running: %1", command)); map cmd = (map) WFM::Execute (.local.bash_output, command); - eat2minestrone (sformat ("Returned: %1", cmd)); + y2milestone ("Command %1 returned: %2", command, cmd); if (cmd["exit"]:-1 == 0) { return true; @@ -449,9 +396,6 @@ SCR::Execute (.target.bash, "/usr/lib/YaST2/bin/update_users_groups " + "'" + String::Quote (Installation::destdir) + "'"); - // update inittab - update_inittab (); - // create /etc/mdadm.conf if it does not exist createmdadm(); 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-packager-2.16.0/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.16.1/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.16.0/src/clients/inst_rpmcopy.ycp 2007-09-17 13:15:07.000000000 +0200 +++ new/yast2-packager-2.16.1/src/clients/inst_rpmcopy.ycp 2007-10-31 15:29:25.000000000 +0100 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 40936 2007-09-17 11:15:07Z lslezak $ + * $Id: inst_rpmcopy.ycp 41629 2007-10-30 08:36:25Z locilka $ */ { @@ -846,6 +846,9 @@ // bugzilla #208222 ReleaseHDDUsedAsInstallationSource(); + // bugzilla #326327 + Packages::SlideShowSetUp (Language::language); + Pkg::SetTextLocale (Language::language); SlideShow::SetLanguage (Language::language); 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-packager-2.16.0/src/clients/media_proposal.ycp new/yast2-packager-2.16.1/src/clients/media_proposal.ycp --- old/yast2-packager-2.16.0/src/clients/media_proposal.ycp 2007-07-19 13:46:48.000000000 +0200 +++ new/yast2-packager-2.16.1/src/clients/media_proposal.ycp 2007-10-31 14:15:08.000000000 +0100 @@ -5,14 +5,13 @@ * * Purpose: Initialize the installation media. * - * $Id: media_proposal.ycp 39526 2007-07-19 11:46:47Z lslezak $ + * $Id: media_proposal.ycp 41684 2007-10-31 13:15:08Z locilka $ * */ { textdomain "packager"; import "HTML"; - import "Update"; import "Mode"; import "Language"; import "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-packager-2.16.0/src/modules/Packages.ycp new/yast2-packager-2.16.1/src/modules/Packages.ycp --- old/yast2-packager-2.16.0/src/modules/Packages.ycp 2007-10-26 12:53:38.000000000 +0200 +++ new/yast2-packager-2.16.1/src/modules/Packages.ycp 2007-10-30 09:36:27.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 41590 2007-10-26 10:53:37Z lslezak $ + * $Id: Packages.ycp 41629 2007-10-30 08:36:25Z locilka $ */ { @@ -804,39 +804,135 @@ return (string)SCR::Read (.content.LABEL); } -void SlideShowSetUp (integer source) { +integer base_source_id = nil; + +boolean FindAndCopySlideDir (string our_slidedir, integer source, string search_for_dir, + string lang_long, string lang_short, string fallback_lang) { + // directory used as a source of texts + string providedir = nil; + + // one of the localizations (long or short) + string used_loc_dir = ""; + + foreach (string try_this_lang, [lang_long, lang_short, fallback_lang], { + if (try_this_lang == nil || try_this_lang == "") + return; + + string test_dir = sformat ("%1/txt/%2", search_for_dir, try_this_lang); + y2milestone ("Checking '%1'", test_dir); + providedir = Pkg::SourceProvideDirectory (source, 1, test_dir, true, true); + + if (providedir != nil) { + y2milestone ("%1 lang found", try_this_lang); + used_loc_dir = try_this_lang; + // don't check for other langs + break; + } + }); + + // no wanted localization found + if (providedir == nil) { + y2milestone ("Neither %1 nor %2 localization found", lang_long, lang_short); + return false; + } + + // where texts are stored later + string loc_slidedir = sformat ("%1/txt/%2/", our_slidedir, used_loc_dir); + WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (loc_slidedir))); + + // copy all files to our own cache + y2milestone ("Copying %1/* to %2", providedir, String::Quote (loc_slidedir)); + WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", providedir, String::Quote (loc_slidedir))); + + // where images are stored + string imagesdir = sformat ("%1/pic", search_for_dir); + + imagesdir = Pkg::SourceProvideDirectory (source, 1, imagesdir, true, true); + + if (imagesdir != nil) { + // where images should be cached + string our_imagesdir = sformat ("%1/pic/", our_slidedir); + WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (our_imagesdir))); + + y2milestone ("Copying %1/* to '%2'", imagesdir, String::Quote (our_imagesdir)); + WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", imagesdir, String::Quote (our_imagesdir))); + } else { + y2error ("No such dir: %1", imagesdir); + } + + return true; +} + +global void SlideShowSetUp (string wanted_language) { + integer source = base_source_id; + + string lang_long = ""; + string lang_short = ""; + + // de_DE.UTF-8 -> de_DE + // es_ES -> es_ES + // blah -> "" + if (wanted_language != nil && wanted_language != "") { + y2milestone ("Selected language: %1", wanted_language); + + if (regexpmatch (wanted_language, "^.+_.+$")) { + lang_long = wanted_language; + } else if (wanted_language != nil && wanted_language != "" && regexpmatch (wanted_language, "^.+_.+\..*$")) { + lang_long = regexpsub (wanted_language, "^(.+)_(.+)\..*", "\\1_\\2"); + } + + if (lang_long != nil && lang_long != "" && regexpmatch (lang_long, ".*_.*")) { + lang_short = regexpsub (lang_long, "(.*)_.*", "\\1"); + } else if (wanted_language != nil && wanted_language != "") { + lang_short = wanted_language; + } + + y2milestone ("Slide Show lang_long: %1, lang_short: %2", lang_long, lang_short); + } else { + y2error ("Wrong language definition: %1", wanted_language); + } + // setup slidedir map productmap = Pkg::SourceProductData (source); string datadir = productmap["datadir"]:"suse"; + // target slideshow directory + string our_slidedir = sformat ("%1/slidedir/", (string) WFM::Read (.local.tmpdir, "")); + WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", our_slidedir)); + // media directory // bugzilla #305097 + // + // bugzilla #326327 + // try to download only slides that are needed (by selected language) + // no images are cached string search_for_dir = sformat ("/%1/setup/slide/", datadir); - string slidedir = Pkg::SourceProvideDirectory (source, 1, search_for_dir, true, true); - - // target slideshow directory - string our_slidedir = (string) WFM::Read (.local.tmpdir, ""); + boolean success = FindAndCopySlideDir (our_slidedir, source, search_for_dir, lang_long, lang_short, SlideShow::fallback_lang); - if (slidedir == nil) { - y2milestone ("No slide directory '%1' found in repository '%2'.", - search_for_dir, source); - } else { - // copy all files to our own copy - y2milestone ("Copying %1/* to %2/", slidedir, our_slidedir); - - WFM::Execute (.local.bash, - sformat ("cp -r %1/* %2/", slidedir, our_slidedir)) ; + // fallback solution disabled +/* + if (success != true) { + y2milestone ("Using fallback solution, language is not supported"); + string fallback_slidedir = Pkg::SourceProvideDirectory (source, 1, search_for_dir, true, true); + + if (fallback_slidedir == nil) { + y2milestone ("No slide directory '%1' found in repository '%2'.", + search_for_dir, source); + } else { + // copy all files to our own cache + y2milestone ("Copying %1/* to %2/", fallback_slidedir, String::Quote (our_slidedir)); + WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2/'", fallback_slidedir, String::Quote (our_slidedir))); + } } - y2milestone ("Setting up the slide directory local copy: %1", - our_slidedir); +*/ + y2milestone ("Setting up the slide directory local copy: %1", our_slidedir); SlideShow::SetSlideDir (our_slidedir); if (load_release_notes (source)) { SlideShow::relnotes = media_prefix + media_text; } - } integer IntegrateServicePack (boolean show_popup, string base_url) { @@ -974,7 +1070,8 @@ } } - SlideShowSetUp (initial_source); + base_source_id = initial_source; + y2milestone ("Base source ID: %1", base_source_id); // Set the product before setting up add-on products // In the autoyast mode it could be that the proposal @@ -1224,7 +1321,7 @@ y2milestone ("XEN Selected: %1", xen_selected); if (xen_selected) { - if (contains (Kernel::GetPackages (), "kernel-pae")) + if (contains (Kernel::GetPackages (), "kernel-bigsmp")) { y2milestone("Selected Xen kernel: kernel-xenpae"); // install PAE Xen 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-packager-2.16.0/src/modules/SlideShow.ycp new/yast2-packager-2.16.1/src/modules/SlideShow.ycp --- old/yast2-packager-2.16.0/src/modules/SlideShow.ycp 2007-08-16 09:09:55.000000000 +0200 +++ new/yast2-packager-2.16.1/src/modules/SlideShow.ycp 2007-10-30 09:36:27.000000000 +0100 @@ -5,7 +5,7 @@ * * Author: Stefan Hundhammer <sh(a)suse.de> * - * $Id: SlideShow.ycp 40268 2007-08-14 15:15:02Z jsuchome $ + * $Id: SlideShow.ycp 41629 2007-10-30 08:36:25Z locilka $ * */ { @@ -19,6 +19,7 @@ import "Stage"; import "String"; import "Wizard"; + import "FileUtils"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -58,6 +59,7 @@ global string slide_txt_path = ""; global string slide_pic_path = ""; + global string fallback_lang = "en"; global integer slide_interval = slide_min_interval; global list<string> slides = []; global string language = Language::language; @@ -399,8 +401,12 @@ **/ list<string> GetSlideList( string lang ) { + list<string> slide_list = nil; + string txt_path = sformat( "%1/txt/%2", slide_base_path, lang ); - list<string> slide_list = (list<string>) SCR::Read (.target.dir, txt_path ); + if (FileUtils::Exists (txt_path)) { + slide_list = (list<string>) SCR::Read (.target.dir, txt_path ); + } if ( slide_list == nil ) { @@ -409,7 +415,10 @@ { lang = substring( lang, 0, 2 ); txt_path = sformat( "%1/txt/%2", slide_base_path, lang ); - slide_list = (list<string>) SCR::Read (.target.dir, txt_path ); + + if (FileUtils::Exists (txt_path)) { + slide_list = (list<string>) SCR::Read (.target.dir, txt_path ); + } } } @@ -419,6 +428,8 @@ } else { + y2milestone ("Using slides from '%1' (%2 slides)", txt_path, size (slide_list)); + slide_list = sort( filter( string filename, slide_list, ``{ // Check for valid extensions - ignore editor save files and other leftover stuff return regexpmatch( filename, ".*\.(rtf|RTF|html|HTML|htm|HTM)$" ); @@ -431,15 +442,18 @@ { slide_txt_path = txt_path; slide_pic_path = slide_base_path + "/pic"; + + y2milestone ("Using TXT: %1, PIC: %2", slide_txt_path, slide_pic_path); } else // No slide texts found { y2debug( "No slides found at %1", txt_path ); - if ( lang != "en" ) + // function calls itself! + if ( lang != fallback_lang ) { - y2debug( "Trying to load slides from fallback: en" ); - slide_list = GetSlideList( "en" ); + y2debug( "Trying to load slides from fallback: %1", fallback_lang ); + slide_list = GetSlideList( fallback_lang ); } } 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-packager-2.16.0/src/modules/test_anim.ycp new/yast2-packager-2.16.1/src/modules/test_anim.ycp --- old/yast2-packager-2.16.0/src/modules/test_anim.ycp 2007-09-03 16:28:25.000000000 +0200 +++ new/yast2-packager-2.16.1/src/modules/test_anim.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -{ - - import "PackageCallbacks"; - - PackageCallbacks::ProgressStart(1, "task", false, true, -1, -1, -1, -1); - PackageCallbacks::ProgressProgress(1, -1, -1); - - sleep(10000); -} 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-packager-2.16.0/src/modules/test_du.ycp new/yast2-packager-2.16.1/src/modules/test_du.ycp --- old/yast2-packager-2.16.0/src/modules/test_du.ycp 2007-09-12 12:43:15.000000000 +0200 +++ new/yast2-packager-2.16.1/src/modules/test_du.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ - -{ - - import "PackageCallbacks"; - - -// Pkg::SourceRestore(); -// Pkg::SourceLoad(); - - - Pkg::SourceCreate("http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/", "/"); - - Pkg::TargetInitDU( - [ - $[ - "name" : "/", - "free" : 7914228, - "used" : 6766716, - "readonly" : false - ], - $[ - "name" : "usr", - "free" : 768968768, - "used" : 220823, - "readonly" : false - ] - ] - ); - - y2internal("DU: %1", Pkg::TargetGetDU()); - - Pkg::PkgInstall("ocfs2-tools"); -// Pkg::PkgSolve(true); - - y2internal("PkgDU: %1", Pkg::PkgDU("ocfs2-tools")); - - y2internal("DU: %1", Pkg::TargetGetDU()); -} - 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-packager-2.16.0/VERSION new/yast2-packager-2.16.1/VERSION --- old/yast2-packager-2.16.0/VERSION 2007-10-26 12:55:15.000000000 +0200 +++ new/yast2-packager-2.16.1/VERSION 2007-10-31 14:12:50.000000000 +0100 @@ -1 +1 @@ -2.16.0 +2.16.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed Oct 31 16:47:19 CET 2007. -------- --- yast2-bootloader/yast2-bootloader.changes 2007-10-11 15:29:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-10-31 14:41:50.161319000 +0100 @@ -1,0 +2,12 @@ +Wed Oct 31 14:32:59 CET 2007 - dfiser(a)suse.cz + +- Adapted to change of StorageDevices API. +- v2.16.2 + +------------------------------------------------------------------- +Wed Oct 31 14:08:59 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.16.1.tar.bz2 New: ---- yast2-bootloader-2.16.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.xJ1267/_old 2007-10-31 16:47:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xJ1267/_new 2007-10-31 16:47:00.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.16.1) +# spec file for package yast2-bootloader (Version 2.16.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.16.1 +Version: 2.16.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.16.1.tar.bz2 +Source0: yast2-bootloader-2.16.2.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -50,7 +50,7 @@ Olaf Dabrunz %prep -%setup -n yast2-bootloader-2.16.1 +%setup -n yast2-bootloader-2.16.2 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +94,12 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Wed Oct 31 2007 - dfiser(a)suse.cz +- Adapted to change of StorageDevices API. +- v2.16.2 +* Wed Oct 31 2007 - locilka(a)suse.cz +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. * Thu Oct 11 2007 - od(a)suse.de - migrate SLES9 persistent device ("...p1") names to SLES10 persistent device names ("...-part1") (#162216) ++++++ yast2-bootloader-2.16.1.tar.bz2 -> yast2-bootloader-2.16.2.tar.bz2 ++++++ ++++ 7521 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-bootloader-2.16.1/configure.in new/yast2-bootloader-2.16.2/configure.in --- old/yast2-bootloader-2.16.1/configure.in 2007-07-03 14:50:07.000000000 +0200 +++ new/yast2-bootloader-2.16.2/configure.in 2007-10-31 14:40:51.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.15.8, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.16.2, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,10 +14,11 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.15.8" +VERSION="2.16.2" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od(a)suse.de>" 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-bootloader-2.16.1/COPYRIGHT.english new/yast2-bootloader-2.16.2/COPYRIGHT.english --- old/yast2-bootloader-2.16.1/COPYRIGHT.english 2007-10-11 15:23:51.000000000 +0200 +++ new/yast2-bootloader-2.16.2/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. 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-bootloader-2.16.1/Makefile.am new/yast2-bootloader-2.16.2/Makefile.am --- old/yast2-bootloader-2.16.1/Makefile.am 2007-07-03 14:50:08.000000000 +0200 +++ new/yast2-bootloader-2.16.2/Makefile.am 2007-10-31 14:40:51.000000000 +0100 @@ -23,14 +23,15 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal @@ -210,8 +211,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # Contents of ./SUBDIRS SUBDIRS = src scripts agents doc 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-bootloader-2.16.1/src/ChangeLog new/yast2-bootloader-2.16.2/src/ChangeLog --- old/yast2-bootloader-2.16.1/src/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.16.2/src/ChangeLog 2007-10-24 15:26:51.000000000 +0200 @@ -0,0 +1,6 @@ +2008-08-28 Philipp Thomas <pth(a)suse.de> + + * clients/bootloader_finish(func == write): Remember status and + call FlagOnetimeBoot if all went well. Use + Bootloader::getDefaultSection to get the name of the default + section. 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-bootloader-2.16.1/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.16.2/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.16.1/src/clients/bootloader_finish.ycp 2007-10-11 14:55:02.000000000 +0200 +++ new/yast2-bootloader-2.16.2/src/clients/bootloader_finish.ycp 2007-10-31 14:11:09.000000000 +0100 @@ -9,7 +9,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: bootloader_finish.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: bootloader_finish.ycp 41683 2007-10-31 13:09:38Z locilka $ * */ @@ -23,7 +23,6 @@ import "Linuxrc"; import "Misc"; import "Mode"; -import "Update"; import "BootCommon"; any ret = nil; @@ -164,8 +163,8 @@ else { retcode = Bootloader::Update ( - Update::installedVersion, - Update::updateVersion); + Installation::installedVersion, + Installation::updateVersion); } if (retcode) { 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-bootloader-2.16.1/src/grub/misc.ycp new/yast2-bootloader-2.16.2/src/grub/misc.ycp --- old/yast2-bootloader-2.16.1/src/grub/misc.ycp 2007-08-10 20:08:38.000000000 +0200 +++ new/yast2-bootloader-2.16.2/src/grub/misc.ycp 2007-10-31 14:32:15.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 40212 2007-08-10 18:08:36Z odabrunz $ + * $Id: misc.ycp 41687 2007-10-31 13:32:10Z dfiser $ * */ @@ -44,7 +44,7 @@ if (BootCommon::globals["boot_custom"]:nil == nil) ret = false; else if (BootCommon::globals["boot_custom"]:nil == - StorageDevices::FloppyDevice) + StorageDevices::FloppyDevice()) ret = true; else if (contains (BootCommon::getFloppyDevices (), BootCommon::globals["boot_custom"]:nil)) @@ -508,8 +508,8 @@ ids[index] = true; } }); - if (StorageDevices::FloppyPresent) - BootCommon::device_mapping[StorageDevices::FloppyDevice] = "fd0"; + if (StorageDevices::FloppyPresent()) + BootCommon::device_mapping[StorageDevices::FloppyDevice()] = "fd0"; y2milestone ("Detected device mapping: %1", BootCommon::device_mapping); } 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-bootloader-2.16.1/src/modules/BootGRUB.ycp new/yast2-bootloader-2.16.2/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.16.1/src/modules/BootGRUB.ycp 2007-10-11 14:55:05.000000000 +0200 +++ new/yast2-bootloader-2.16.2/src/modules/BootGRUB.ycp 2007-10-31 14:32:15.000000000 +0100 @@ -15,7 +15,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootGRUB.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: BootGRUB.ycp 41687 2007-10-31 13:32:10Z dfiser $ * */ @@ -567,7 +567,7 @@ "__devs" : [], ]); } - else if (StorageDevices::FloppyPresent) + else if (StorageDevices::FloppyPresent()) { out = add (out, $[ "name" : BootCommon::translateSectionTitle("floppy"), 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-bootloader-2.16.1/src/modules/ChangeLog new/yast2-bootloader-2.16.2/src/modules/ChangeLog --- old/yast2-bootloader-2.16.1/src/modules/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.16.2/src/modules/ChangeLog 2007-10-24 15:26:51.000000000 +0200 @@ -0,0 +1,12 @@ +2007-08-28 Philipp Thomas <pth(a)suse.de> + + * Bootloader(Summary): Turn code to determine section index into + Function and move it to + * BootCommon(Section2Index): Here. + * BootGRUB(FlagOnetimeBoot): reverse renaming. + Use BootCommon::Section2Index to get index of section. + * BootLILO(FlagOnetimeBoot): Rename back to old name. + * BootELILO(FlagOnetimeBoot): Likewise. + * BootPOWERLILO(FlagOnetimeBoot): Likewise. + * BootZIPL(FlagOnetimeBoot): Likewise. + 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-bootloader-2.16.1/src/routines/ChangeLog new/yast2-bootloader-2.16.2/src/routines/ChangeLog --- old/yast2-bootloader-2.16.1/src/routines/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.16.2/src/routines/ChangeLog 2007-10-24 15:26:51.000000000 +0200 @@ -0,0 +1,9 @@ +2007-08-28 Philipp Thomas <pth(a)suse.de> + + * switcher.ycp(blFlagBootDefaultOnce): Renamed back to old name. + + +2007-08-23 Philipp Thomas <pth(a)suse.de> + + * switcher.ycp(blFlagOneTimeBoot): Rename to blFlagBootDefaultOnce, + and map to flagbootdefaultonce. 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-bootloader-2.16.1/src/routines/global_widgets.ycp new/yast2-bootloader-2.16.2/src/routines/global_widgets.ycp --- old/yast2-bootloader-2.16.1/src/routines/global_widgets.ycp 2006-09-27 02:26:21.000000000 +0200 +++ new/yast2-bootloader-2.16.2/src/routines/global_widgets.ycp 2007-10-31 14:32:15.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: global_widgets.ycp 33156 2006-09-27 00:26:18Z odabrunz $ + * $Id: global_widgets.ycp 41687 2007-10-31 13:32:10Z dfiser $ * */ @@ -519,13 +519,13 @@ ))); }; - if (StorageDevices::FloppyPresent) + if (StorageDevices::FloppyPresent()) { targetlist = add (targetlist, `VSpacing (1)); targetlist = add (targetlist, `Left (`RadioButton (`id ("floppy"), `opt (`notify), // radiobutton, %1 is device name, typically /dev/fd0 - sformat (_("&Floppy Disk %1"), StorageDevices::FloppyDevice), + sformat (_("&Floppy Disk %1"), StorageDevices::FloppyDevice()), (BootCommon::selected_location == "floppy") ))); } 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-bootloader-2.16.1/src/routines/helps.ycp new/yast2-bootloader-2.16.2/src/routines/helps.ycp --- old/yast2-bootloader-2.16.1/src/routines/helps.ycp 2006-01-02 14:59:32.000000000 +0100 +++ new/yast2-bootloader-2.16.2/src/routines/helps.ycp 2007-10-31 14:32:15.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: helps.ycp 26696 2005-12-21 09:31:47Z visnov $ + * $Id: helps.ycp 41687 2007-10-31 13:32:10Z dfiser $ * */ @@ -126,7 +126,7 @@ if it is needed or configure your other boot manager to start &product;."); - if (StorageDevices::FloppyPresent) + if (StorageDevices::FloppyPresent()) { // custom bootloader help text, 4 of 7 // this part will only be shown if a floppy drive is attached. 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-bootloader-2.16.1/src/routines/lilolike.ycp new/yast2-bootloader-2.16.2/src/routines/lilolike.ycp --- old/yast2-bootloader-2.16.1/src/routines/lilolike.ycp 2007-10-11 14:55:08.000000000 +0200 +++ new/yast2-bootloader-2.16.2/src/routines/lilolike.ycp 2007-10-31 14:32:15.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: lilolike.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: lilolike.ycp 41687 2007-10-31 13:32:10Z dfiser $ * */ { @@ -1242,8 +1242,8 @@ ids[index] = true; } }); - if (StorageDevices::FloppyPresent) - device_mapping[StorageDevices::FloppyDevice] = "fd0"; + if (StorageDevices::FloppyPresent()) + device_mapping[StorageDevices::FloppyDevice()] = "fd0"; y2milestone ("Detected device mapping: %1", device_mapping); } 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-bootloader-2.16.1/src/routines/misc.ycp new/yast2-bootloader-2.16.2/src/routines/misc.ycp --- old/yast2-bootloader-2.16.1/src/routines/misc.ycp 2007-08-13 22:32:15.000000000 +0200 +++ new/yast2-bootloader-2.16.2/src/routines/misc.ycp 2007-10-31 14:32:15.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 40242 2007-08-13 20:32:13Z odabrunz $ + * $Id: misc.ycp 41687 2007-10-31 13:32:10Z dfiser $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -606,7 +606,7 @@ if (BootCommon::selected_location == "root") return BootCommon::RootPartitionDevice; if (BootCommon::selected_location == "floppy") - return StorageDevices::FloppyDevice; + return StorageDevices::FloppyDevice(); if (BootCommon::selected_location == "mbr_md") return "mbr_md"; if (BootCommon::selected_location == "none") @@ -678,7 +678,7 @@ // FIXME: floppy support is probably obsolete if ( haskey(BootCommon::globals, "boot_floppy") && BootCommon::globals["boot_floppy"]:"false" == "true" ) { - ret = add(ret, StorageDevices::FloppyDevice); + ret = add(ret, StorageDevices::FloppyDevice()); } if ( haskey(BootCommon::globals, "boot_custom") ) { ret = add(ret, BootCommon::globals["boot_custom"]:""); @@ -716,7 +716,7 @@ boolean ret = false; if (loader_device == nil) ret = false; - else if (loader_device == StorageDevices::FloppyDevice) + else if (loader_device == StorageDevices::FloppyDevice()) ret = true; else if (contains (getFloppyDevices (), loader_device)) ret = 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-bootloader-2.16.1/VERSION new/yast2-bootloader-2.16.2/VERSION --- old/yast2-bootloader-2.16.1/VERSION 2007-10-11 15:22:18.000000000 +0200 +++ new/yast2-bootloader-2.16.2/VERSION 2007-10-31 14:34:07.000000000 +0100 @@ -1 +1 @@ -2.16.1 +2.16.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package yast2 checked in at Wed Oct 31 16:46:52 CET 2007. -------- --- yast2/yast2.changes 2007-10-30 17:26:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-10-31 13:21:27.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Oct 31 13:19:42 CET 2007 - locilka(a)suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.4 + +------------------------------------------------------------------- Old: ---- yast2-2.16.3.tar.bz2 New: ---- yast2-2.16.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.b32029/_old 2007-10-31 16:46:20.000000000 +0100 +++ /var/tmp/diff_new_pack.b32029/_new 2007-10-31 16:46:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.16.3) +# spec file for package yast2 (Version 2.16.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2 -Version: 2.16.3 +Version: 2.16.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.16.3.tar.bz2 +Source0: yast2-2.16.4.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite @@ -43,6 +43,7 @@ Conflicts: yast2-network < 2.15.58 # Hotplug and HwStatus modules Conflicts: yast2-installation < 2.16.2 +Conflicts: yast2-update < 2.16.0 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard @@ -114,7 +115,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.16.3 +%setup -n yast2-2.16.4 %build %{prefix}/bin/y2tool y2autoconf @@ -217,6 +218,10 @@ %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Wed Oct 31 2007 - locilka(a)suse.cz +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- 2.16.4 * Tue Oct 30 2007 - locilka(a)suse.cz - Modules Hotplug and HwStatus moved here from yast2-installation to remove yast2-storage dependency on yast2-installation. ++++++ yast2-2.16.3.tar.bz2 -> yast2-2.16.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.3/library/control/src/Installation.ycp new/yast2-2.16.4/library/control/src/Installation.ycp --- old/yast2-2.16.3/library/control/src/Installation.ycp 2007-09-24 16:56:32.000000000 +0200 +++ new/yast2-2.16.4/library/control/src/Installation.ycp 2007-10-31 13:21:41.000000000 +0100 @@ -12,7 +12,7 @@ * Klaus Kaempf <kkaempf(a)suse.de> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: Installation.ycp 40175 2007-08-10 11:57:52Z locilka $ + * $Id: Installation.ycp 41668 2007-10-31 12:21:40Z locilka $ */ { @@ -112,6 +112,34 @@ */ global boolean license_accepted = false; + // These maps are used by several YaST modules. + + /** + * Version of the targetsystem (currently installed one). + * + * @struct $[ + * "name" : (string) "openSUSE", + * "version" : (string) "10.1", + * "nameandversion" : (string) "openSUSE 10.1", + * "major" : (integer) 10, + * "minor" : (integer) 1, + * ] + */ + global map <string, any> installedVersion = $[]; + + /** + * Version of system to update to (will be installed, or is + * just being installed). + * + * @struct $[ + * "name" : (string) "openSUSE", + * "version" : (string) "11.0", + * "nameandversion" : (string) "openSUSE 11.0", + * "major" : (integer) 11, + * "minor" : (integer) 0, + * ] + */ + global map <string, any> updateVersion = $[]; //--------------------------------------------------------------- // constructor diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.3/library/modules/Version.ycp new/yast2-2.16.4/library/modules/Version.ycp --- old/yast2-2.16.3/library/modules/Version.ycp 2007-10-30 17:26:46.000000000 +0100 +++ new/yast2-2.16.4/library/modules/Version.ycp 2007-10-31 13:23:13.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.16.3"; +global string yast2 = "2.16.4"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.3/VERSION new/yast2-2.16.4/VERSION --- old/yast2-2.16.3/VERSION 2007-10-30 17:26:03.000000000 +0100 +++ new/yast2-2.16.4/VERSION 2007-10-31 13:21:32.000000000 +0100 @@ -1 +1 @@ -2.16.3 +2.16.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc42
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package gcc42 checked in at Wed Oct 31 16:45:40 CET 2007. -------- --- gcc42/cross-alpha-gcc-icecream-backend.changes 2007-10-12 15:27:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/cross-alpha-gcc-icecream-backend.changes 2007-10-30 15:24:40.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 30 11:22:32 CET 2007 - rguenther(a)suse.de + +- Update to suse-gcc-4_2-branch head (r129775). +- Fix rpmlint override file. + +------------------------------------------------------------------- cross-arm-gcc-icecream-backend.changes: same change cross-avr-gcc42.changes: same change cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc42.changes: same change libgcj42.changes: same change Old: ---- gcc-4.2.2-20071008.tar.bz2 pr31899.diff pr33381.diff pr33714.diff New: ---- gcc-4.2.3-20071030.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-alpha-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.a21119/_old 2007-10-31 16:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.a21119/_new 2007-10-31 16:44:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-alpha-gcc-icecream-backend (Version 4.2.2_20071008) +# spec file for package cross-alpha-gcc-icecream-backend (Version 4.2.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -License: BSD 3-Clause; GPL v2 or later; LGPL v2 or later; X11/MIT -Version: 4.2.2_20071008 +License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT +Version: 4.2.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -57,9 +57,6 @@ Patch38: large-gcc.diff Patch40: pr27880.diff Patch41: pr31490.diff -Patch44: pr33381.diff -Patch45: pr31899.diff -Patch46: pr33714.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -131,9 +128,6 @@ #%patch38 %patch40 %patch41 -%patch44 -%patch45 -%patch46 %patch51 %patch55 %patch57 @@ -350,6 +344,9 @@ %defattr(-,root,root) /usr/share/icecream-envs %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r129775). +- Fix rpmlint override file. * Fri Oct 12 2007 - rguenther(a)suse.de - Add patch for PR33714. [#331767] * Mon Oct 08 2007 - rguenther(a)suse.de cross-arm-gcc-icecream-backend.spec: same change ++++++ cross-avr-gcc42.spec ++++++ --- /var/tmp/diff_new_pack.a21119/_old 2007-10-31 16:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.a21119/_new 2007-10-31 16:44:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc42 (Version 4.2.2_20071008) +# spec file for package cross-avr-gcc42 (Version 4.2.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,8 +25,8 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -License: BSD 3-Clause; GPL v2 or later; LGPL v2 or later; X11/MIT -Version: 4.2.2_20071008 +License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT +Version: 4.2.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -54,9 +54,6 @@ Patch38: large-gcc.diff Patch40: pr27880.diff Patch41: pr31490.diff -Patch44: pr33381.diff -Patch45: pr31899.diff -Patch46: pr33714.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -125,9 +122,6 @@ #%patch38 %patch40 %patch41 -%patch44 -%patch45 -%patch46 %patch51 %patch55 %patch57 @@ -313,6 +307,9 @@ %defattr(-,root,root) %{_prefix} %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r129775). +- Fix rpmlint override file. * Fri Oct 12 2007 - rguenther(a)suse.de - Add patch for PR33714. [#331767] * Mon Oct 08 2007 - rguenther(a)suse.de ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.a21119/_old 2007-10-31 16:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.a21119/_new 2007-10-31 16:44:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa-gcc-icecream-backend (Version 4.2.2_20071008) +# spec file for package cross-hppa-gcc-icecream-backend (Version 4.2.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -License: BSD 3-Clause; GPL v2 or later; LGPL v2 or later; X11/MIT -Version: 4.2.2_20071008 +License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT +Version: 4.2.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -57,9 +57,6 @@ Patch38: large-gcc.diff Patch40: pr27880.diff Patch41: pr31490.diff -Patch44: pr33381.diff -Patch45: pr31899.diff -Patch46: pr33714.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -131,9 +128,6 @@ #%patch38 %patch40 %patch41 -%patch44 -%patch45 -%patch46 %patch51 %patch55 %patch57 @@ -350,6 +344,9 @@ %defattr(-,root,root) /usr/share/icecream-envs %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r129775). +- Fix rpmlint override file. * Fri Oct 12 2007 - rguenther(a)suse.de - Add patch for PR33714. [#331767] * Mon Oct 08 2007 - rguenther(a)suse.de cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change ++++++ gcc42.spec ++++++ --- /var/tmp/diff_new_pack.a21119/_old 2007-10-31 16:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.a21119/_new 2007-10-31 16:44:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gcc42 (Version 4.2.2_20071008) +# spec file for package gcc42 (Version 4.2.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -102,7 +102,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GPL v2 or later -Version: 4.2.2_20071008 +Version: 4.2.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -137,9 +137,6 @@ Patch38: large-gcc.diff Patch40: pr27880.diff Patch41: pr31490.diff -Patch44: pr33381.diff -Patch45: pr31899.diff -Patch46: pr33714.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -1235,9 +1232,6 @@ #%patch38 %patch40 %patch41 -%patch44 -%patch45 -%patch46 %patch51 %patch55 %patch57 @@ -2143,6 +2137,9 @@ %doc testresults/*.log %endif %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r129775). +- Fix rpmlint override file. * Fri Oct 12 2007 - rguenther(a)suse.de - Add patch for PR33714. [#331767] * Mon Oct 08 2007 - rguenther(a)suse.de ++++++ libgcj42.spec ++++++ --- /var/tmp/diff_new_pack.a21119/_old 2007-10-31 16:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.a21119/_new 2007-10-31 16:44:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgcj42 (Version 4.2.2_20071008) +# spec file for package libgcj42 (Version 4.2.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -113,8 +113,8 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -License: GPL v2 or later; LGPL v2 or later -Version: 4.2.2_20071008 +License: GPL v2 or later; LGPL v2.1 or later +Version: 4.2.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -149,9 +149,6 @@ Patch38: large-gcc.diff Patch40: pr27880.diff Patch41: pr31490.diff -Patch44: pr33381.diff -Patch45: pr31899.diff -Patch46: pr33714.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -523,9 +520,6 @@ #%patch38 %patch40 %patch41 -%patch44 -%patch45 -%patch46 %patch51 %patch55 %patch57 @@ -1016,6 +1010,9 @@ %doc testresults/*.log %endif %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to suse-gcc-4_2-branch head (r129775). +- Fix rpmlint override file. * Fri Oct 12 2007 - rguenther(a)suse.de - Add patch for PR33714. [#331767] * Mon Oct 08 2007 - rguenther(a)suse.de ++++++ fortify-2.diff ++++++ --- /var/tmp/diff_new_pack.a21119/_old 2007-10-31 16:44:21.000000000 +0100 +++ /var/tmp/diff_new_pack.a21119/_new 2007-10-31 16:44:21.000000000 +0100 @@ -1,33 +1,3 @@ ---- doc/invoke.texi -+++ doc/invoke.texi -@@ -302,7 +302,7 @@ - @xref{Optimize Options,,Options that Control Optimization}. - @gccoptlist{-falign-functions=@var{n} -falign-jumps=@var{n} @gol - -falign-labels=@var{n} -falign-loops=@var{n} @gol ---fbounds-check -fmudflap -fmudflapth -fmudflapir @gol -+-fbounds-check -ffortify=@var{n} -fmudflap -fmudflapth -fmudflapir @gol - -fbranch-probabilities -fprofile-values -fvpt -fbranch-target-load-optimize @gol - -fbranch-target-load-optimize2 -fbtr-bb-exclusive @gol - -fcaller-saves -fcprop-registers -fcse-follow-jumps @gol -@@ -4796,6 +4796,18 @@ - currently only supported by the Java and Fortran front-ends, where - this option defaults to true and false respectively. - -+@item -ffortify -+@itemx -ffortify=@var{n} -+Instrument a set of string, memory and printf related functions into their -+_chk variants. @var{n} controls the behaviour in detail. A fortify level -+of 1 will produce compile warnings, but expand the _chk variants -+back into the non-checking equivalent, and therefore not introduce any -+run-time overhead in the generated code. A level of 2 will emit calls -+to the _chk variants if the overflow checking can only be done during -+runtime. Higher fortify levels are passed down to the printf related -+check functions and might control further fortify levels. A level of 0 -+disables the instrumentation. -+ - @item -fmudflap -fmudflapth -fmudflapir - @opindex fmudflap - @opindex fmudflapth --- tree.h +++ tree.h @@ -2989,6 +2989,16 @@ ++++++ gcc-4.2.2-20071008.tar.bz2 -> gcc-4.2.3-20071030.tar.bz2 ++++++ gcc42/gcc-4.2.2-20071008.tar.bz2 /mounts/work_src_done/STABLE/gcc42/gcc-4.2.3-20071030.tar.bz2 differ: byte 12, line 1 ++++++ gcc.spec.in ++++++ --- gcc42/gcc.spec.in 2007-10-12 15:26:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/gcc.spec.in 2007-10-30 15:26:36.000000000 +0100 @@ -117,7 +117,7 @@ URL: http://gcc.gnu.org/ License: GPL -Version: 4.2.2_20071008 +Version: 4.2.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -154,9 +154,6 @@ Patch38: large-gcc.diff Patch40: pr27880.diff Patch41: pr31490.diff -Patch44: pr33381.diff -Patch45: pr31899.diff -Patch46: pr33714.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -784,9 +781,6 @@ #%patch38 %patch40 %patch41 -%patch44 -%patch45 -%patch46 %patch51 %patch55 %patch57 ++++++ libgcj42-rpmlintrc ++++++ --- gcc42/libgcj42-rpmlintrc 2007-07-04 16:31:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/libgcj42-rpmlintrc 2007-10-30 11:22:19.000000000 +0100 @@ -1,4 +1,4 @@ # This line is mandatory to access the configuration functions from Config import * -addFilter ("libgcj_bc42 shlib-policy-name-error") +addFilter ("libgcj_bc42.*shlib-policy-name-error") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ntp-client
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package yast2-ntp-client checked in at Wed Oct 31 16:41:49 CET 2007. -------- --- yast2-ntp-client/yast2-ntp-client.changes 2007-10-03 19:01:07.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-10-31 14:14:48.345018000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 31 13:53:04 CET 2007 - kmachalkova(a)suse.cz + +- Prompt for installing xntp package (CheckAndInstallPackages) on + running system, do not scan repositories (Package::Available()) + (#327336) +- 2.16.1 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-2.16.0.tar.bz2 New: ---- yast2-ntp-client-2.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.wQ5426/_old 2007-10-31 16:41:20.000000000 +0100 +++ /var/tmp/diff_new_pack.wQ5426/_new 2007-10-31 16:41:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ntp-client (Version 2.16.0) +# spec file for package yast2-ntp-client (Version 2.16.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ntp-client -Version: 2.16.0 +Version: 2.16.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ntp-client-2.16.0.tar.bz2 +Source0: yast2-ntp-client-2.16.1.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite #SLPAPI.pm @@ -36,7 +36,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-ntp-client-2.16.0 +%setup -n yast2-ntp-client-2.16.1 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,11 @@ %doc %{prefix}/share/doc/packages/yast2-ntp-client /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc %changelog +* Wed Oct 31 2007 - kmachalkova(a)suse.cz +- Prompt for installing xntp package (CheckAndInstallPackages) on + running system, do not scan repositories (Package::Available()) + (#327336) +- 2.16.1 * Wed Oct 03 2007 - kmachalkova(a)suse.cz - Added visual progress feedback for running ntpdate in installation proposal (#328469) ++++++ yast2-ntp-client-2.16.0.tar.bz2 -> yast2-ntp-client-2.16.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.0/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.16.1/src/ntp-client_proposal.ycp --- old/yast2-ntp-client-2.16.0/src/ntp-client_proposal.ycp 2007-10-02 11:19:44.000000000 +0200 +++ new/yast2-ntp-client-2.16.1/src/ntp-client_proposal.ycp 2007-10-31 12:57:29.000000000 +0100 @@ -16,8 +16,10 @@ import "Stage"; import "Package"; import "Packages"; +import "PackageSystem"; import "Pkg"; import "Popup"; +import "Report"; y2milestone("----------------------------------------"); y2milestone("Ntp client proposal started"); @@ -153,8 +155,29 @@ ret = `invalid_hostname; else { - Popup::ShowFeedback("", _("Synchronizing with NTP server...")); - y2milestone("Running ntpdate to sync with %1", ntp_server); + string required_package = "xntp"; + + //In 1st stage, schedule packages for installation + if (Stage::initial()) + { + if (Package::Available(required_package)) + { + Packages::addAdditionalPackage(required_package); + // bugzilla #327050 + // Agent for writing /etc/ntp.conf needs to be installed + // to write the settings at the end of the installation + Packages::addAdditionalPackage("yast2-ntp-client"); + } + } + //Otherwise, prompt user for confirming pkg installation + else + { + if (!PackageSystem::CheckAndInstallPackages([ required_package ])) + { + Report::Error(sformat( _("Synchronization with NTP server is not possible +without having package %1 installed"), required_package)); + } + } integer status = -1; string service_name = "ntp"; @@ -169,19 +192,11 @@ Service::Stop (service_name); } - //Schedule package for installation - if (Package::Available("xntp")) - // FIXME: later use - // if (Package::Available("xntp")) { Packages::addAdditionalPackage("xntp"); } - Packages::addAdditionalPackage("xntp"); - // bugzilla #327050 - // Agent for writing /etc/ntp.conf needs to be installed - // to write the settings at the end of the installation - Packages::addAdditionalPackage("yast2-ntp-client"); + Popup::ShowFeedback("", _("Synchronizing with NTP server...")); + y2milestone("Running ntpdate to sync with %1", ntp_server); integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server))); y2milestone ("'ntpdate %1' returned %2", ntp_server, r); - Popup::ClearFeedback(); if( !Stage::initial()) { @@ -196,7 +211,9 @@ AddSingleServer(ntp_server); } else - ret = `ntpdate_failed; + ret = `ntpdate_failed; + + Popup::ClearFeedback(); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.0/VERSION new/yast2-ntp-client-2.16.1/VERSION --- old/yast2-ntp-client-2.16.0/VERSION 2007-10-03 18:54:26.000000000 +0200 +++ new/yast2-ntp-client-2.16.1/VERSION 2007-10-31 13:56:17.000000000 +0100 @@ -1 +1 @@ -2.16.0 +2.16.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-online-update
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package yast2-online-update checked in at Wed Oct 31 12:41:27 CET 2007. -------- --- yast2-online-update/yast2-online-update.changes 2007-10-10 14:51:25.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2007-10-31 11:22:43.983547000 +0100 @@ -1,0 +2,6 @@ +Wed Oct 31 09:23:13 CET 2007 - jsuchome(a)suse.cz + +- use --quiet option for zypper in cron job (#335305) +- 2.16.1 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.16.0.tar.bz2 New: ---- yast2-online-update-2.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.AC3897/_old 2007-10-31 12:41:01.000000000 +0100 +++ /var/tmp/diff_new_pack.AC3897/_new 2007-10-31 12:41:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.16.0) +# spec file for package yast2-online-update (Version 2.16.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.16.0 +Version: 2.16.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.16.0.tar.bz2 +Source0: yast2-online-update-2.16.1.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -48,7 +48,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.16.0 +%setup -n yast2-online-update-2.16.1 %build %{prefix}/bin/y2tool y2autoconf @@ -148,6 +148,9 @@ /var/lib/YaST2/cd_update.desktop %ghost %{prefix}/share/applications/YaST2/cd_update.desktop %changelog +* Wed Oct 31 2007 - jsuchome(a)suse.cz +- use --quiet option for zypper in cron job (#335305) +- 2.16.1 * Wed Oct 10 2007 - jsuchome(a)suse.cz - do not log progress on DoneDownload callback (#331271) - 2.16.0 ++++++ yast2-online-update-2.16.0.tar.bz2 -> yast2-online-update-2.16.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.0/src/AutoOnlineUpdate.ycp new/yast2-online-update-2.16.1/src/AutoOnlineUpdate.ycp --- old/yast2-online-update-2.16.0/src/AutoOnlineUpdate.ycp 2007-09-14 22:11:35.000000000 +0200 +++ new/yast2-online-update-2.16.1/src/AutoOnlineUpdate.ycp 2007-10-31 09:22:16.000000000 +0100 @@ -192,12 +192,12 @@ if (timing == `weekly && day >= 0 && day <= 7) { - cronjob = sformat( "%1 %2 * * %3 root %4 up -y -t patch %5", + cronjob = sformat( "%1 %2 * * %3 root %4 up -y --quiet -t patch %5", minute, hour, day, updater, options); } else { - cronjob = sformat ("%1 %2 * * * root %3 up -y -t patch %4", + cronjob = sformat ("%1 %2 * * * root %3 up -y --quiet -t patch %4", minute, hour, updater, options); } // if ( autoget ) cronjob = cronjob + " -d"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.0/VERSION new/yast2-online-update-2.16.1/VERSION --- old/yast2-online-update-2.16.0/VERSION 2007-10-10 14:38:42.000000000 +0200 +++ new/yast2-online-update-2.16.1/VERSION 2007-10-31 09:26:27.000000000 +0100 @@ -1 +1 @@ -2.16.0 +2.16.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sax2
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package sax2 checked in at Wed Oct 31 12:40:50 CET 2007. -------- --- sax2/sax2.changes 2007-10-30 18:25:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2007-10-31 12:15:51.043447000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 12:13:28 CET 2007 - ms(a)suse.de + +- fixed variant setup (#337513) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.e31918/_old 2007-10-31 12:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.e31918/_new 2007-10-31 12:39:00.000000000 +0100 @@ -45,7 +45,7 @@ %endif Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 282 +Release: 283 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -487,6 +487,8 @@ %{_prefix}/%{_lib}/sax/plugins/SaX.so %endif %changelog +* Wed Oct 31 2007 - ms(a)suse.de +- fixed variant setup (#337513) * Tue Oct 30 2007 - ms(a)suse.de - disabled profiles logitech-Gaming, logitech-MediaPlay logitech-mxlaser and logitech-optical (#337822) ++++++ sax2.tar.bz2 ++++++ sax2/sax2.tar.bz2 /mounts/work_src_done/STABLE/sax2/sax2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0